summaryrefslogtreecommitdiffstats
path: root/android_webview/Android.mk
diff options
context:
space:
mode:
authortorne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-22 16:43:24 +0000
committertorne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-22 16:43:24 +0000
commita5578850f830bf8e852debf559957348a66ec858 (patch)
treefed9a02170b3c67a0e42b862f7eaf9d14d255a97 /android_webview/Android.mk
parentd9b6d57c79b698a2a3b00b0842b77db53f1c961e (diff)
downloadchromium_src-a5578850f830bf8e852debf559957348a66ec858.zip
chromium_src-a5578850f830bf8e852debf559957348a66ec858.tar.gz
chromium_src-a5578850f830bf8e852debf559957348a66ec858.tar.bz2
Android WebView: fix locale pak location.
We need to copy the locale paks into the same directory as all the other paks, not into a locales/ subdirectory, because that's what the android code expects. Tweak the Android makefile slightly to do this. BUG= Review URL: https://codereview.chromium.org/11228030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163307 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/Android.mk')
-rw-r--r--android_webview/Android.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/android_webview/Android.mk b/android_webview/Android.mk
index 3255df2..dbe9b0b 100644
--- a/android_webview/Android.mk
+++ b/android_webview/Android.mk
@@ -63,5 +63,6 @@ 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 := locales/en-US
+LOCAL_MODULE_STEM := en-US
+LOCAL_BUILT_MODULE_STEM := locales/en-US.pak
include $(LOCAL_PATH)/webview_pak.mk