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

Unified Diff: extensions/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: extensions/common/BUILD.gn
diff --git a/extensions/common/BUILD.gn b/extensions/common/BUILD.gn
index c76d9b1bbcafa48d62c74a1a7db0379857269632..67de6b034599ee3d550ea7476ce8b8242348bdf5 100644
--- a/extensions/common/BUILD.gn
+++ b/extensions/common/BUILD.gn
@@ -27,7 +27,7 @@ if (enable_extensions) {
# GYP version: extensions/extensions.gyp:extensions_common
# This must be a static library because extensions common depends on
- # GetTrustedICAPublicKey in extensions/browser which isn't always linked
+ # GetTrustedICAPublicKey in extensions/browser which isn"t always linked
# in. TODO(brettw): This reverse dependency should be fixed.
static_library("common") {
sources = rebase_path(extensions_gypi_values.extensions_common_sources,
@@ -54,7 +54,6 @@ if (enable_extensions) {
"//content/public/common",
"//crypto",
"//device/bluetooth",
- "//device/usb",
"//extensions/common/api",
"//extensions/strings",
"//extensions:extensions_resources",
@@ -69,6 +68,17 @@ if (enable_extensions) {
"//url",
]
+ if (!is_android) {
+ deps += ["//device/usb"]
+ } else {
+ sources -= [
+ "api/printer_provider/usb_printer_manifest_data.cc",
+ "api/printer_provider/usb_printer_manifest_data.h",
+ "api/printer_provider/usb_printer_manifest_handler.cc",
+ "api/printer_provider/usb_printer_manifest_handler.h",
+ ]
+ }
+
if (use_openssl) {
sources +=
rebase_path(extensions_gypi_values.extensions_common_sources_openssl,

Powered by Google App Engine
This is Rietveld 408576698