[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..50f5dcfc5cd95647c5dbb7ae6c2deb5042fc342d 100644
--- a/android_webview/webview_pak.mk
+++ b/android_webview/webview_pak.mk
@@ -5,6 +5,12 @@
 # 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)
+
+# This module is used to copy the .pak files to /system/webview/paks in the
+# system image.
 LOCAL_MODULE_CLASS := GYP
 LOCAL_MODULE_SUFFIX := .pak
 LOCAL_MODULE_PATH := $(TARGET_OUT_JAVA_LIBRARIES)/webview/paks
@@ -14,3 +20,20 @@ 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)
+
+# This module is used to copy the .pak files to an intermediates folder so that
+# they can be picked up by AAPT and included in an .apk.
+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)))