Than Ngo
2 years ago
parent
8d7d7962cb
commit
edd83a7cb1
@ -1,19 +1,66 @@
|
||||
diff -up chromium-112.0.5615.49/components/feed/core/v2/protocol_translator.cc.me chromium-112.0.5615.49/components/feed/core/v2/protocol_translator.cc
|
||||
--- chromium-112.0.5615.49/components/feed/core/v2/protocol_translator.cc.me 2023-03-31 20:33:32.129658455 +0200
|
||||
+++ chromium-112.0.5615.49/components/feed/core/v2/protocol_translator.cc 2023-03-31 20:41:19.593822038 +0200
|
||||
@@ -10,7 +10,6 @@
|
||||
#include "base/logging.h"
|
||||
#include "base/time/time.h"
|
||||
#include "components/feed/core/proto/v2/packing.pb.h"
|
||||
-#include "components/feed/core/proto/v2/wire/chrome_feed_response_metadata.pb.h"
|
||||
#include "components/feed/core/proto/v2/wire/data_operation.pb.h"
|
||||
#include "components/feed/core/proto/v2/wire/feature.pb.h"
|
||||
#include "components/feed/core/proto/v2/wire/feed_response.pb.h"
|
||||
@@ -19,7 +18,6 @@
|
||||
#include "components/feed/core/proto/v2/wire/stream_structure.pb.h"
|
||||
#include "components/feed/core/proto/v2/wire/token.pb.h"
|
||||
#include "components/feed/core/v2/feedstore_util.h"
|
||||
-#include "components/feed/core/v2/ios_shared_experiments_translator.h"
|
||||
#include "components/feed/core/v2/metrics_reporter.h"
|
||||
#include "components/feed/core/v2/proto_util.h"
|
||||
#include "components/feed/feed_feature_list.h"
|
||||
Split out ios shared feed protos
|
||||
|
||||
chrome_feed_response_metadata.proto is needed in ios so split it out
|
||||
so it can be separately compiled into ios.
|
||||
|
||||
Change-Id: I9e5e50f5e1742258f5c8197d54f0c610b56daf4b
|
||||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4266050
|
||||
Commit-Queue: edchin <edchin@google.com>
|
||||
Reviewed-by: Dan H <harringtond@chromium.org>
|
||||
Cr-Commit-Position: refs/heads/main@{#1107357}
|
||||
diff --git a/components/feed/core/proto/BUILD.gn b/components/feed/core/proto/BUILD.gn
|
||||
index 51916e08..f0ec531 100644
|
||||
--- a/components/feed/core/proto/BUILD.gn
|
||||
+++ b/components/feed/core/proto/BUILD.gn
|
||||
@@ -22,7 +22,6 @@
|
||||
"v2/wire/capabilities_debug_data.proto",
|
||||
"v2/wire/capability.proto",
|
||||
"v2/wire/chrome_client_info.proto",
|
||||
- "v2/wire/chrome_feed_response_metadata.proto",
|
||||
"v2/wire/chrome_fulfillment_info.proto",
|
||||
"v2/wire/client_info.proto",
|
||||
"v2/wire/client_user_profiles.proto",
|
||||
@@ -69,6 +68,10 @@
|
||||
]
|
||||
}
|
||||
|
||||
+proto_library("proto_ios_shared_v2") {
|
||||
+ sources = [ "v2/wire/chrome_feed_response_metadata.proto" ]
|
||||
+}
|
||||
+
|
||||
if (is_android) {
|
||||
proto_java_library("proto_java_v2") {
|
||||
proto_path = "../../../../"
|
||||
diff --git a/components/feed/core/v2/BUILD.gn b/components/feed/core/v2/BUILD.gn
|
||||
index ab5efcc4..b1d3fb4 100644
|
||||
--- a/components/feed/core/v2/BUILD.gn
|
||||
+++ b/components/feed/core/v2/BUILD.gn
|
||||
@@ -172,6 +172,7 @@
|
||||
":ios_shared",
|
||||
"//base",
|
||||
"//components/feed/core/common:feed_core_common",
|
||||
+ "//components/feed/core/proto:proto_ios_shared_v2",
|
||||
"//components/feed/core/proto:proto_v2",
|
||||
]
|
||||
}
|
||||
@@ -187,7 +188,7 @@
|
||||
deps = [
|
||||
"//base",
|
||||
"//components/feed/core/common:feed_core_common",
|
||||
- "//components/feed/core/proto:proto_v2",
|
||||
+ "//components/feed/core/proto:proto_ios_shared_v2",
|
||||
"//components/prefs",
|
||||
]
|
||||
}
|
||||
diff --git a/components/feed/core/v2/public/ios/BUILD.gn b/components/feed/core/v2/public/ios/BUILD.gn
|
||||
index 106f089a..59bdd2b 100644
|
||||
--- a/components/feed/core/v2/public/ios/BUILD.gn
|
||||
+++ b/components/feed/core/v2/public/ios/BUILD.gn
|
||||
@@ -25,7 +25,6 @@
|
||||
deps = [
|
||||
":feed_ios_public",
|
||||
"//base/test:test_support",
|
||||
- "//components/feed/core/v2:feed_core_v2",
|
||||
"//components/prefs",
|
||||
"//components/prefs:test_support",
|
||||
"//testing/gmock",
|
||||
|
||||
Loading…
Reference in new issue