diff options
| author | benm@chromium.org <benm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-07 22:56:19 +0000 |
|---|---|---|
| committer | benm@chromium.org <benm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-07 22:56:19 +0000 |
| commit | bcd32b1077eb4a311d5c45092c1eb98a68bc1edf (patch) | |
| tree | 7deac61365f51b0d6245b50912eef2df3d1899a4 /android_webview | |
| parent | 7798731b524dd9578e0406139cfbeb4dec8bfc23 (diff) | |
| download | chromium_src-bcd32b1077eb4a311d5c45092c1eb98a68bc1edf.zip chromium_src-bcd32b1077eb4a311d5c45092c1eb98a68bc1edf.tar.gz chromium_src-bcd32b1077eb4a311d5c45092c1eb98a68bc1edf.tar.bz2 | |
[Android WebView] Rename android_webview paks to webviewchromium.
Android bots green.
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/11475035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171876 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
4 files changed, 11 insertions, 11 deletions
diff --git a/android_webview/Android.mk b/android_webview/Android.mk index 194ba52..5675085 100644 --- a/android_webview/Android.mk +++ b/android_webview/Android.mk @@ -47,16 +47,16 @@ include $(BUILD_STATIC_JAVA_LIBRARY) # These packages are the resource paks used by webview. include $(CLEAR_VARS) -LOCAL_MODULE := android_webview_pak -LOCAL_MODULE_STEM := android_webview -LOCAL_BUILT_MODULE_STEM := android_webview/assets/android_webview.pak +LOCAL_MODULE := webviewchromium_pak +LOCAL_MODULE_STEM := webviewchromium +LOCAL_BUILT_MODULE_STEM := android_webview/assets/webviewichromium.pak include $(LOCAL_PATH)/webview_pak.mk # TODO(benm): remove when we get all our strings from java. include $(CLEAR_VARS) -LOCAL_MODULE := android_webview_strings_pak -LOCAL_MODULE_STEM := android_webview_strings -LOCAL_BUILT_MODULE_STEM := android_webview/assets/android_webview_strings.pak +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 diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp index 537797b..90cfcd6 100644 --- a/android_webview/android_webview.gyp +++ b/android_webview/android_webview.gyp @@ -64,7 +64,7 @@ '<@(pak_inputs)', ], 'outputs': [ - '<(PRODUCT_DIR)/android_webview/assets/android_webview.pak', + '<(PRODUCT_DIR)/android_webview/assets/webviewchromium.pak', ], 'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'], @@ -89,7 +89,7 @@ '<@(pak_inputs)', ], 'outputs': [ - '<(PRODUCT_DIR)/android_webview/assets/android_webview_strings.pak', + '<(PRODUCT_DIR)/android_webview/assets/webviewchromium_strings.pak', ], 'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'], diff --git a/android_webview/browser/aw_browser_main_parts.cc b/android_webview/browser/aw_browser_main_parts.cc index 3785fa3..c8af525 100644 --- a/android_webview/browser/aw_browser_main_parts.cc +++ b/android_webview/browser/aw_browser_main_parts.cc @@ -65,10 +65,10 @@ int AwBrowserMainParts::PreCreateThreads() { FilePath pak_path; PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &pak_path); ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath( - pak_path.AppendASCII("android_webview_strings.pak"), + pak_path.AppendASCII("webviewchromium_strings.pak"), ui::SCALE_FACTOR_NONE); ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath( - pak_path.AppendASCII("android_webview.pak"), + pak_path.AppendASCII("webviewchromium.pak"), ui::SCALE_FACTOR_NONE); return content::RESULT_CODE_NORMAL_EXIT; 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 ef7e779..22984c8 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 @@ -14,7 +14,7 @@ public class AndroidWebViewTestRunnerApplication extends Application { /** The minimum set of .pak files the test runner needs. */ private static final String[] MANDATORY_PAKS = { - "android_webview.pak", "android_webview_strings.pak" + "webviewchromium.pak", "webviewchromium_strings.pak" }; @Override |