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

Unified Diff: content/browser/BUILD.gn

Issue 561623002: GN: Enable blink and (nearly) all of content in android build (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months 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/app/BUILD.gn ('k') | content/common/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/BUILD.gn
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index da4844476cd50d3b47a7fe94b47e59516d1a5cbd..e2f2899491ed21d644925f77ace19487c4db3684 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -49,7 +49,6 @@ source_set("browser") {
"//ui/native_theme",
"//ui/resources",
"//ui/snapshot",
- "//ui/wm",
]
if (is_ios) {
@@ -137,7 +136,7 @@ source_set("browser") {
sources -= [ "renderer_host/web_input_event_aurawin.cc" ]
}
- if (!is_win && !is_mac && (!is_linux || !use_udev)) {
+ if (!is_win && !is_mac && !is_android && (!is_linux || !use_udev)) {
sources += [ "gamepad/gamepad_platform_data_fetcher.cc" ]
}
@@ -261,6 +260,7 @@ source_set("browser") {
} else {
sources -= [
"power_save_blocker_x11.cc",
+ "renderer_host/web_input_event_aurax11.cc",
]
}
@@ -308,7 +308,7 @@ source_set("browser") {
"speech/speech_recognizer_impl.h",
]
deps += [
- #"//content:jni_headers", TODO(GYP)
+ "//content/public/android:jni",
"//media",
]
libs += [ "jnigraphics" ]
@@ -342,6 +342,7 @@ source_set("browser") {
deps += [
"//ui/aura",
"//ui/strings",
+ "//ui/wm",
]
} else { # Not aura.
sources -= [
« no previous file with comments | « content/app/BUILD.gn ('k') | content/common/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698