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

Unified Diff: chrome/browser/devtools/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/browser/devtools/BUILD.gn
diff --git a/chrome/browser/devtools/BUILD.gn b/chrome/browser/devtools/BUILD.gn
index 976801b0ef17979d367dc05a87e72586b26af6e9..e4862ab2c2cddca6011904da9b0aa2d1adae5f47 100644
--- a/chrome/browser/devtools/BUILD.gn
+++ b/chrome/browser/devtools/BUILD.gn
@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-if (!is_android) {
+if (!is_android || use_aura) {
import("//tools/grit/grit_rule.gni")
}
@@ -63,7 +63,7 @@ static_library("devtools") {
"//net",
]
- if (!is_android) {
+ if (!is_android || use_aura) {
deps += [
"//chrome/app/theme:theme_resources",
"//chrome/common/extensions/api",
@@ -132,10 +132,16 @@ static_library("devtools") {
"remote_debugging_server.cc",
"remote_debugging_server.h",
]
+
+ if (is_android) {
+ deps -= [
+ "//third_party/libusb",
+ ]
+ }
}
}
-if (!is_android) {
+if (!is_android || use_aura) {
# GYP version: chrome/browser/devtools/webrtc_device_provider_resources.gyp:webrtc_device_provider_resources
grit("webrtc_device_provider_resources") {
source = "device/webrtc/resources.grd"

Powered by Google App Engine
This is Rietveld 408576698