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

Unified Diff: chrome/common/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: chrome/common/BUILD.gn
diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
index 273b1972eb8bba3c35e5a25ed6c67462b9a835f8..d42bc6ae8a0ce4e524f5606da8369c5e80335f29 100644
--- a/chrome/common/BUILD.gn
+++ b/chrome/common/BUILD.gn
@@ -117,7 +117,6 @@ static_library("common") {
".",
"//chrome")
deps += [
- "//device/usb",
"//chrome/common/extensions/api",
"//extensions/common",
"//extensions/common/api",
@@ -131,6 +130,9 @@ static_library("common") {
".",
"//chrome")
}
+ if (!is_android) {
+ deps += ["//device/usb"]
+ }
}
if (is_win || is_mac) {
@@ -193,12 +195,17 @@ static_library("common") {
if (is_android) {
sources -= [
- "badge_util.cc",
"channel_info_posix.cc",
- "icon_with_badge_image_source.cc",
"media_galleries/metadata_types.h",
]
- } else {
+ if (!use_aura) {
+ sources -= [
+ "badge_util.cc",
+ "icon_with_badge_image_source.cc",
+ ]
+ }
+ }
+ if (!is_android || use_aura) {
# Non-Android.
sources +=
rebase_path(gypi_values.chrome_common_importer_sources, ".", "//chrome")

Powered by Google App Engine
This is Rietveld 408576698