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

Unified Diff: ui/base/BUILD.gn

Issue 1391893003: NOT FOR REVIEW: Aura on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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
Index: ui/base/BUILD.gn
diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
index 15ad86c835b844328f628e0acf325ae16b329a6b..0a850aaa4699e3ea1780d2f31fdbccfafe50e1be 100644
--- a/ui/base/BUILD.gn
+++ b/ui/base/BUILD.gn
@@ -148,6 +148,7 @@ component("base") {
"hit_test.h",
"idle/idle.cc",
"idle/idle.h",
+ "idle/idle_android.cc",
"idle/idle_chromeos.cc",
"idle/idle_linux.cc",
"idle/idle_mac.mm",
@@ -553,11 +554,18 @@ component("base") {
}
}
- if (is_android || is_ios) {
+ if ((is_android && !use_aura) || is_ios) {
sources -= [
"device_form_factor_desktop.cc",
"idle/idle.cc",
"idle/idle.h",
+ "idle/idle_android.cc",
+ ]
+ }
+
+ if (is_android && use_aura) {
+ sources -= [
+ "device_form_factor_desktop.cc",
]
}
}

Powered by Google App Engine
This is Rietveld 408576698