commit 86218cd889c29680d505e1559711061c5a42a930
author Marcin Kosiba <mkosiba@google.com> Tue Jul 29 10:41:55 2014 +0100
committer Ben Murdoch <benm@google.com> Fri Aug 01 12:35:19 2014 +0100
tree 695e294022d587b9b6f4e2858efffb1c45d723eb
parent a8ac5679247b16cb84262218ab819ee6c467d7ac

Cherry Pick Generate R class for the glue layer.

This makes AAPT generate the R class for the glue layer namespace.
This is needed because we removed the line from the upstream
resources_config.mk file.

Original Change-Id: I3229ebdf92e062a402efc2a3863bfc393651e9fa

Bug: 16723226
Change-Id: Ibf1009b0b1e1093dcccd20f6cfbc81f2525d869f

chromium/Android.mk

diff --git a/chromium/Android.mk b/chromium/Android.mk
index 9676bac..53e7f27 100644
--- a/chromium/Android.mk
+++ b/chromium/Android.mk
@@ -39,8 +39,9 @@
 include $(CHROMIUM_PATH)/android_webview/build/resources_config.mk
 LOCAL_RESOURCE_DIR := \
     $(LOCAL_PATH)/res \
-    $(android_webview_resources_dirs)
+    $android_webview_resources_dirs)
 LOCAL_AAPT_FLAGS := $(android_webview_aapt_flags)
+LOCAL_AAPT_FLAGS += --extra-packages com.android.webview.chromium
 LOCAL_AAPT_FLAGS += --shared-lib
 
 LOCAL_JNI_SHARED_LIBRARIES += libwebviewchromium