diff options
| author | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-29 22:16:36 +0000 |
|---|---|---|
| committer | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-29 22:16:36 +0000 |
| commit | 51ac158ba0c1c1c7c6dad96844573fda16992ffe (patch) | |
| tree | d9eaa81511978025b612a657a5fa8cbec96e68c7 | |
| parent | 2603dfe18d8375d3128372ff567cdae79888ca5c (diff) | |
| download | chromium_src-51ac158ba0c1c1c7c6dad96844573fda16992ffe.zip chromium_src-51ac158ba0c1c1c7c6dad96844573fda16992ffe.tar.gz chromium_src-51ac158ba0c1c1c7c6dad96844573fda16992ffe.tar.bz2 | |
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
| -rw-r--r-- | chrome/chrome_repack_resources.gypi | 7 | ||||
| -rw-r--r-- | 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', |