summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--content/app/BUILD.gn5
-rw-r--r--content/browser/BUILD.gn2
-rw-r--r--content/test/BUILD.gn2
3 files changed, 6 insertions, 3 deletions
diff --git a/content/app/BUILD.gn b/content/app/BUILD.gn
index b83b529..7d3e5ee 100644
--- a/content/app/BUILD.gn
+++ b/content/app/BUILD.gn
@@ -3,6 +3,7 @@
# found in the LICENSE file.
import("//build/config/chrome_build.gni")
+import("//build/config/ui.gni")
content_app_sources = [
"android/app_jni_registrar.cc",
@@ -49,8 +50,10 @@ if (is_win) {
"//device/vibration",
"//skia",
"//third_party/android_tools:cpu_features",
- "//ui/android",
]
+ if (!use_aura) {
+ content_app_deps += [ "//ui/android" ]
+ }
}
if (is_ios) {
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index fb2092e..6f6c3b9 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -381,6 +381,7 @@ source_set("browser") {
".",
"//content")
sources -= [ "renderer_host/begin_frame_observer_proxy.cc" ]
+ deps += [ "//ui/android" ]
}
deps -= [ "//device/battery" ]
@@ -388,7 +389,6 @@ source_set("browser") {
"//content/public/android:jni",
"//media",
"//mojo/android:libsystem_java",
- "//ui/android",
]
defines += [ "APPCACHE_USE_SIMPLE_CACHE" ]
libs += [ "jnigraphics" ]
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
index 69fff6e..2e07ded 100644
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
@@ -155,7 +155,7 @@ source_set("test_support") {
]
}
- if (is_android) {
+ if (is_android && !use_aura) {
deps += [
"//ui/android",
"//ui/shell_dialogs",