From 51ac158ba0c1c1c7c6dad96844573fda16992ffe Mon Sep 17 00:00:00 2001 From: "nileshagrawal@chromium.org" Date: Mon, 29 Oct 2012 22:16:36 +0000 Subject: Revert "Exclude unused resources from Android build." This reverts commit e23c1449de91a72ada4c41a05fe3009802b5748d. Breaks the clobber build. BUG= Review URL: https://codereview.chromium.org/11341026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164750 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/chrome_repack_resources.gypi | 7 ++++++- chrome/chrome_resources.gyp | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/chrome/chrome_repack_resources.gypi b/chrome/chrome_repack_resources.gypi index 04d2e93..a785af6 100644 --- a/chrome/chrome_repack_resources.gypi +++ b/chrome/chrome_repack_resources.gypi @@ -9,7 +9,7 @@ '<(grit_out_dir)/sync_internals_resources.pak', ], 'conditions': [ - ['OS != "ios" and OS != "android"', { + ['OS != "ios"', { 'pak_inputs': [ '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak', '<(grit_out_dir)/component_extension_resources.pak', @@ -19,6 +19,11 @@ '<(grit_out_dir)/quota_internals_resources.pak', ], }], + ['OS != "mac" and OS != "ios"', { + 'pak_inputs': [ + '<(grit_out_dir)/quota_internals_resources.pak', + ], + }], ], }, 'inputs': [ diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp index f9fc384..fddc821 100644 --- a/chrome/chrome_resources.gyp +++ b/chrome/chrome_resources.gyp @@ -31,7 +31,7 @@ ], 'includes': [ '../build/grit_target.gypi' ], 'conditions': [ - ['OS != "ios" and OS != "android"', { + ['OS != "ios"', { 'dependencies': [ '../content/browser/debugger/devtools_resources.gyp:devtools_resources', ], @@ -116,7 +116,7 @@ }, ], 'conditions': [ - ['enable_extensions==1', { + ['OS != "ios"', { 'actions': [ { 'action_name': 'extensions_api_resources', -- cgit v1.1