File chromium-112-feed_protos.patch of Package chromium
Reverts the following upstream change:
Change-Id: I9e5e50f5e1742258f5c8197d54f0c610b56daf4b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4266050
Due to build failures on Leap
Index: chromium-112.0.5615.49/components/feed/core/proto/BUILD.gn
===================================================================
--- chromium-112.0.5615.49.orig/components/feed/core/proto/BUILD.gn
+++ chromium-112.0.5615.49/components/feed/core/proto/BUILD.gn
@@ -22,6 +22,7 @@ proto_library("proto_v2") {
"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",
@@ -68,10 +69,6 @@ proto_library("proto_v2") {
]
}
-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 = "../../../../"
Index: chromium-112.0.5615.49/components/feed/core/v2/BUILD.gn
===================================================================
--- chromium-112.0.5615.49.orig/components/feed/core/v2/BUILD.gn
+++ chromium-112.0.5615.49/components/feed/core/v2/BUILD.gn
@@ -173,7 +173,6 @@ source_set("feed_core_v2") {
":ios_shared",
"//base",
"//components/feed/core/common:feed_core_common",
- "//components/feed/core/proto:proto_ios_shared_v2",
"//components/feed/core/proto:proto_v2",
]
}
@@ -189,7 +188,7 @@ source_set("ios_shared") {
deps = [
"//base",
"//components/feed/core/common:feed_core_common",
- "//components/feed/core/proto:proto_ios_shared_v2",
+ "//components/feed/core/proto:proto_v2",
"//components/prefs",
]
}
Index: chromium-112.0.5615.49/components/feed/core/v2/public/ios/BUILD.gn
===================================================================
--- chromium-112.0.5615.49.orig/components/feed/core/v2/public/ios/BUILD.gn
+++ chromium-112.0.5615.49/components/feed/core/v2/public/ios/BUILD.gn
@@ -25,6 +25,7 @@ source_set("feed_ios_unit_tests") {
deps = [
":feed_ios_public",
"//base/test:test_support",
+ "//components/feed/core/v2:feed_core_v2",
"//components/prefs",
"//components/prefs:test_support",
"//testing/gmock",