Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(20)

Unified Diff: third_party/WebKit/public/BUILD.gn

Issue 2555093002: Fixes BUILD rules from previous cherrypick (Closed)
Patch Set: Fix Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/public/android/BUILD.gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/public/BUILD.gn
diff --git a/third_party/WebKit/public/BUILD.gn b/third_party/WebKit/public/BUILD.gn
index f928f765b51fb43343e13c9c32dbd355513a70ef..86a5b12c42a30b6738200c3b99336e99ff94ae38 100644
--- a/third_party/WebKit/public/BUILD.gn
+++ b/third_party/WebKit/public/BUILD.gn
@@ -657,7 +657,6 @@ mojom("mojo_bindings") {
"platform/modules/serviceworker/service_worker_event_status.mojom",
]
public_deps = [
- ":android_mojo_bindings",
":new_wrapper_types_mojo_bindings",
"//mojo/common:common_custom_types",
"//url/mojo:url_mojom_origin",
@@ -665,15 +664,10 @@ mojom("mojo_bindings") {
use_new_wrapper_types = false
- # The chromium variant must be linked with content and use the same export
- # settings in component build because of the WebBluetoothDeviceId typemap
- # inside content.
+ # See comments above.
export_class_attribute = "CONTENT_EXPORT"
export_define = "CONTENT_IMPLEMENTATION=1"
export_header = "content/common/content_export.h"
-
- # Similarly, the blink variant must be linked with the platform component
- # since it uses types from it in its typemaps.
export_class_attribute_blink = "BLINK_PLATFORM_EXPORT"
export_define_blink = "BLINK_PLATFORM_IMPLEMENTATION=1"
export_header_blink = "third_party/WebKit/public/platform/WebCommon.h"
@@ -772,6 +766,6 @@ source_set("shared_typemap_traits") {
"web/WindowFeaturesStructTraits.cpp",
]
deps = [
- ":mojo_bindings_shared__generator",
+ ":new_wrapper_types_mojo_bindings_shared__generator",
]
}
« no previous file with comments | « content/public/android/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698