diff options
| author | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-29 19:10:18 +0000 |
|---|---|---|
| committer | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-29 19:10:18 +0000 |
| commit | e23c1449de91a72ada4c41a05fe3009802b5748d (patch) | |
| tree | 68098e8f2de9cec84971633044d1fda2d9f6b670 /chrome | |
| parent | a55e0239bada4e803dad6b2872a68a71af88a441 (diff) | |
| download | chromium_src-e23c1449de91a72ada4c41a05fe3009802b5748d.zip chromium_src-e23c1449de91a72ada4c41a05fe3009802b5748d.tar.gz chromium_src-e23c1449de91a72ada4c41a05fe3009802b5748d.tar.bz2 | |
Exclude unused resources from Android build.
Excluded resources due to this change:
AUDITSPANEL_JS
CODEMIRRORTEXTEDITOR_JS
DEVTOOLS_CSS
DEVTOOLS_EXTENSION_API_JS
DEVTOOLS_JS
ELEMENTSPANEL_JS
HEAPSNAPSHOTWORKER_JS
IDR_BOOKMARK_MANAGER_BOOKMARK_MAIN_JS
IDR_NET_INTERNALS_INDEX_HTML
IDR_NET_INTERNALS_INDEX_JS
IDR_OPTIONS_BUNDLE_JS
IDR_OPTIONS_HTML
IMAGES_PROFILESSILHOUETTE_PNG
IMAGES_SCRIPTSSILHOUETTE_PNG
IMAGES_TOOLBARICONS_PNG
IMAGES_TOOLBARICONSSMALL_PNG
NETWORKPANEL_JS
PROFILESPANEL_JS
RESOURCESPANEL_JS
SCRIPTFORMATTERWORKER_JS
SCRIPTSPANEL_JS
TIMELINEPANEL_JS
BUG=155069
Review URL: https://chromiumcodereview.appspot.com/11306009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164702 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/chrome_repack_resources.gypi | 7 | ||||
| -rw-r--r-- | chrome/chrome_resources.gyp | 4 |
2 files changed, 3 insertions, 8 deletions
diff --git a/chrome/chrome_repack_resources.gypi b/chrome/chrome_repack_resources.gypi index a785af6..04d2e93 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"', { + ['OS != "ios" and OS != "android"', { 'pak_inputs': [ '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak', '<(grit_out_dir)/component_extension_resources.pak', @@ -19,11 +19,6 @@ '<(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 fddc821..f9fc384 100644 --- a/chrome/chrome_resources.gyp +++ b/chrome/chrome_resources.gyp @@ -31,7 +31,7 @@ ], 'includes': [ '../build/grit_target.gypi' ], 'conditions': [ - ['OS != "ios"', { + ['OS != "ios" and OS != "android"', { 'dependencies': [ '../content/browser/debugger/devtools_resources.gyp:devtools_resources', ], @@ -116,7 +116,7 @@ }, ], 'conditions': [ - ['OS != "ios"', { + ['enable_extensions==1', { 'actions': [ { 'action_name': 'extensions_api_resources', |