diff options
| author | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-29 11:56:54 +0000 |
|---|---|---|
| committer | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-29 11:56:54 +0000 |
| commit | 8b81e050226de9b2f7614557e12c13fc3f3690eb (patch) | |
| tree | ac380394cc59a4209fd0460387b2b00cefe25fa2 /android_webview | |
| parent | bc2e49b7e0d76946543643e340988ca8aa402094 (diff) | |
| download | chromium_src-8b81e050226de9b2f7614557e12c13fc3f3690eb.zip chromium_src-8b81e050226de9b2f7614557e12c13fc3f3690eb.tar.gz chromium_src-8b81e050226de9b2f7614557e12c13fc3f3690eb.tar.bz2 | |
Android WebView: remove resources.pak from build.
We don't need resources.pak any more as it's never loaded and only
contains resources used by code in src/chrome/. Don't depend on it or
package it into the test APK.
BUG=
Review URL: https://codereview.chromium.org/11326002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164624 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
4 files changed, 1 insertions, 9 deletions
diff --git a/android_webview/Android.mk b/android_webview/Android.mk index dbe9b0b..8c424ed 100644 --- a/android_webview/Android.mk +++ b/android_webview/Android.mk @@ -51,11 +51,6 @@ LOCAL_MODULE_STEM := chrome include $(LOCAL_PATH)/webview_pak.mk include $(CLEAR_VARS) -LOCAL_MODULE := webviewchromium_res_resources -LOCAL_MODULE_STEM := resources -include $(LOCAL_PATH)/webview_pak.mk - -include $(CLEAR_VARS) LOCAL_MODULE := webviewchromium_res_chrome_100_percent LOCAL_MODULE_STEM := chrome_100_percent include $(LOCAL_PATH)/webview_pak.mk diff --git a/android_webview/all_webview.gyp b/android_webview/all_webview.gyp index f6e43c8..69716db 100644 --- a/android_webview/all_webview.gyp +++ b/android_webview/all_webview.gyp @@ -14,7 +14,6 @@ 'dependencies': [ 'android_webview.gyp:libwebviewchromium', '../chrome/chrome_resources.gyp:packed_resources', - '../chrome/chrome_resources.gyp:packed_extra_resources', # Needed by android_webview_java '../net/net.gyp:net_errors_java', ], diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp index 229ce2f..400aed5 100644 --- a/android_webview/android_webview.gyp +++ b/android_webview/android_webview.gyp @@ -124,13 +124,11 @@ 'input_pak_files': [ '<(SHARED_INTERMEDIATE_DIR)/repack/chrome.pak', '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_100_percent.pak', - '<(SHARED_INTERMEDIATE_DIR)/repack/resources.pak', '<(SHARED_INTERMEDIATE_DIR)/repack/en-US.pak', ], 'copied_pak_files': [ '<(PRODUCT_DIR)/android_webview/assets/chrome.pak', '<(PRODUCT_DIR)/android_webview/assets/chrome_100_percent.pak', - '<(PRODUCT_DIR)/android_webview/assets/resources.pak', '<(PRODUCT_DIR)/android_webview/assets/en-US.pak', ], 'additional_input_paths': [ '<@(copied_pak_files)' ], diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestRunnerApplication.java b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestRunnerApplication.java index e8d8f76..e031b0d 100644 --- a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestRunnerApplication.java +++ b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestRunnerApplication.java @@ -20,7 +20,7 @@ public class AndroidWebViewTestRunnerApplication extends Application { /** The minimum set of .pak files Chrome needs. */ private static final String[] CHROME_MANDATORY_PAKS = { - "chrome.pak", "chrome_100_percent.pak", "en-US.pak", "resources.pak", + "chrome.pak", "chrome_100_percent.pak", "en-US.pak", }; private static final String PRIVATE_DATA_DIRECTORY_SUFFIX = "webview"; |