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

Unified Diff: content/content_shell.gypi

Issue 17389005: [Android] Abandon bundling DevTools frontends for mobile apps (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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: content/content_shell.gypi
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index 1a8d0fe23d316f15de4428d2300336573795f452..f91d43b96612417d9fd7093ee4e1190199faccf4 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -289,6 +289,13 @@
'<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources',
'<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings',
],
+ 'conditions': [
+ ['OS=="android"', {
+ 'dependencies!': [
+ 'browser/devtools/devtools_resources.gyp:devtools_resources',
+ ],
+ }],
+ ],
'variables': {
'repack_path': '<(DEPTH)/tools/grit/grit/format/repack.py',
},
@@ -304,11 +311,17 @@
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/webui_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_strings/ui_strings_en-US.pak',
- '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak',
],
+ 'conditions': [
+ ['OS!="android"', {
+ 'pak_inputs': [
+ '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak',
+ ],
+ }],
+ ],
},
'inputs': [
'<(repack_path)',

Powered by Google App Engine
This is Rietveld 408576698