diff options
| author | benm@chromium.org <benm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-11 11:11:25 +0000 |
|---|---|---|
| committer | benm@chromium.org <benm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-11 11:11:25 +0000 |
| commit | a0284b656a864990d42f077cf863b00166ff141b (patch) | |
| tree | 3fc4e023d8850c8cfa12b709ab4f090cdf19dd7d /android_webview | |
| parent | 80a0b0698cc61b4d7d98ac27617678b0738b024a (diff) | |
| download | chromium_src-a0284b656a864990d42f077cf863b00166ff141b.zip chromium_src-a0284b656a864990d42f077cf863b00166ff141b.tar.gz chromium_src-a0284b656a864990d42f077cf863b00166ff141b.tar.bz2 | |
[Android WebView] Remove pak rules that depend on chrome/
These rules are no longer needed and finally break android_webview's
ties with the chrome/ layer!
Android only; android bots green
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/11511003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172304 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/Android.mk | 19 | ||||
| -rw-r--r-- | android_webview/all_webview.gyp | 1 | ||||
| -rw-r--r-- | android_webview/android_webview.gyp | 19 |
3 files changed, 0 insertions, 39 deletions
diff --git a/android_webview/Android.mk b/android_webview/Android.mk index a6e9c17..96dd2c901 100644 --- a/android_webview/Android.mk +++ b/android_webview/Android.mk @@ -59,22 +59,3 @@ LOCAL_MODULE := webviewchromium_strings_pak LOCAL_MODULE_STEM := webviewchromium_strings LOCAL_BUILT_MODULE_STEM := android_webview/assets/webviewchromium_strings.pak include $(LOCAL_PATH)/webview_pak.mk - -# TODO(benm): Remove the following pak rules when the above -# rules have rolled downstream. -include $(CLEAR_VARS) -LOCAL_MODULE := webviewchromium_res_chrome -LOCAL_MODULE_STEM := chrome -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 - -# TODO(torne): add other locales (filtered by PRODUCT_LOCALES?) -include $(CLEAR_VARS) -LOCAL_MODULE := webviewchromium_res_en-US -LOCAL_MODULE_STEM := en-US -LOCAL_BUILT_MODULE_STEM := locales/en-US.pak -include $(LOCAL_PATH)/webview_pak.mk diff --git a/android_webview/all_webview.gyp b/android_webview/all_webview.gyp index 69716db..0eaf5bc 100644 --- a/android_webview/all_webview.gyp +++ b/android_webview/all_webview.gyp @@ -13,7 +13,6 @@ 'type': 'none', 'dependencies': [ 'android_webview.gyp:libwebviewchromium', - '../chrome/chrome_resources.gyp:packed_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 90cfcd6..12066d7 100644 --- a/android_webview/android_webview.gyp +++ b/android_webview/android_webview.gyp @@ -198,8 +198,6 @@ 'type': 'none', 'dependencies': [ '../base/base.gyp:base_java', - '../chrome/chrome_resources.gyp:packed_extra_resources', - '../chrome/chrome_resources.gyp:packed_resources', '../content/content.gyp:content_java', '../content/content.gyp:navigation_interception_java', '../content/content.gyp:web_contents_delegate_android_java', @@ -214,24 +212,7 @@ 'manifest_package_name': 'org.chromium.android_webview', 'java_in_dir': '../android_webview/java', 'native_libs_paths': ['<(SHARED_LIB_DIR)/libwebviewchromium.so'], - 'input_pak_files': [ - '<(SHARED_INTERMEDIATE_DIR)/repack/chrome.pak', - '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_100_percent.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/en-US.pak', - ], - 'additional_input_paths': [ '<@(copied_pak_files)' ], }, - 'copies': [ - { - 'destination': '<(PRODUCT_DIR)/android_webview/assets', - 'files': [ '<@(input_pak_files)' ] - }, - ], 'includes': [ '../build/java_apk.gypi' ], }, ], |