[android_webview] Don't unconditionally add pak files to system image.

android_webview/webview_pak.mk

Index: android_webview/webview_pak.mk
diff --git a/android_webview/webview_pak.mk b/android_webview/webview_pak.mk
index dff89a2ece946c2634cd93d478e3bb161eb0f21a..a463fd92a1ef9f35f0fde5dd6d56b05f2515c235 100644
--- a/android_webview/webview_pak.mk
+++ b/android_webview/webview_pak.mk
@@ -5,6 +5,10 @@
 # This makefile fragment describes how to install a Chromium pak into the
 # Android framework for use by WebView.
 
+my_local_module := $(LOCAL_MODULE)
+my_local_module_stem := $(LOCAL_MODULE_STEM)
+my_local_built_module_stem := $(LOCAL_BUILT_MODULE_STEM)
+
 LOCAL_MODULE_CLASS := GYP
 LOCAL_MODULE_SUFFIX := .pak
 LOCAL_MODULE_PATH := $(TARGET_OUT_JAVA_LIBRARIES)/webview/paks
@@ -14,3 +18,18 @@ include $(BUILD_SYSTEM)/base_rules.mk
 built_by_gyp := $(call intermediates-dir-for,GYP,shared)/$(LOCAL_BUILT_MODULE_STEM)
 
 $(eval $(call copy-one-file,$(built_by_gyp),$(LOCAL_BUILT_MODULE)))
+
+include $(CLEAR_VARS)

[Primiano Tucci (use gerrit), 2014/07/28 08:01:02]

Can you please add a comment before lines 8 and 22, just to explain what these
two rules are doing and where are they copying to? something like:
# Copies the ???.pak into
out/target/product/foo/system/frameworks/webview/paks/en.pak

[mkosiba (inactive), 2014/07/28 09:36:08]

Done.

+
+LOCAL_MODULE := res-$(my_local_module)
+LOCAL_MODULE_STEM := $(my_local_module_stem)
+LOCAL_BUILT_MODULE_STEM := $(my_local_built_module_stem)
+LOCAL_MODULE_CLASS := GYP
+LOCAL_MODULE_SUFFIX := .pak
+LOCAL_MODULE_PATH := $(call intermediates-dir-for,APPS,webviewchromium-paks)
+
+include $(BUILD_SYSTEM)/base_rules.mk
+
+built_by_gyp := $(call intermediates-dir-for,GYP,shared)/$(LOCAL_BUILT_MODULE_STEM)
+
+$(eval $(call copy-one-file,$(built_by_gyp),$(LOCAL_BUILT_MODULE)))