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)', |