diff options
| author | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-02 22:56:29 +0000 |
|---|---|---|
| committer | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-02 22:56:29 +0000 |
| commit | ca79c689fa4fd87c8bdd51c9e3a28fb7e740d844 (patch) | |
| tree | 5b64b2badf5471ff225305532086b5cb12dc2cef /chrome/chrome_repack_resources.gypi | |
| parent | bf351b24e8e7b0ee37cafffc13013d7665237a91 (diff) | |
| download | chromium_src-ca79c689fa4fd87c8bdd51c9e3a28fb7e740d844.zip chromium_src-ca79c689fa4fd87c8bdd51c9e3a28fb7e740d844.tar.gz chromium_src-ca79c689fa4fd87c8bdd51c9e3a28fb7e740d844.tar.bz2 | |
Revert "Revert "Exclude unused resources from Android build.""
This reverts commit 51ac158ba0c1c1c7c6dad96844573fda16992ffe.
Was breaking the clobber build. We need to run these grit actions as they
also generate .cc/h files which are included in the android build.
Also adding back devtools_discovery and net_internals as they are used
on Android.
Original review: http://codereview.chromium.org/11306009/
BUG=155069
Review URL: https://chromiumcodereview.appspot.com/11362042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165788 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_repack_resources.gypi')
| -rw-r--r-- | chrome/chrome_repack_resources.gypi | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/chrome_repack_resources.gypi b/chrome/chrome_repack_resources.gypi index a785af6..5f81178 100644 --- a/chrome/chrome_repack_resources.gypi +++ b/chrome/chrome_repack_resources.gypi @@ -9,19 +9,19 @@ '<(grit_out_dir)/sync_internals_resources.pak', ], 'conditions': [ - ['OS != "ios"', { + ['OS != "ios" and OS != "android"', { + # New paks should be added here by default. 'pak_inputs': [ '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak', '<(grit_out_dir)/component_extension_resources.pak', - '<(grit_out_dir)/devtools_discovery_page_resources.pak', - '<(grit_out_dir)/net_internals_resources.pak', '<(grit_out_dir)/options_resources.pak', '<(grit_out_dir)/quota_internals_resources.pak', ], }], - ['OS != "mac" and OS != "ios"', { + ['OS != "ios"', { 'pak_inputs': [ - '<(grit_out_dir)/quota_internals_resources.pak', + '<(grit_out_dir)/devtools_discovery_page_resources.pak', + '<(grit_out_dir)/net_internals_resources.pak', ], }], ], |