commit 3d4e9d0641849cdfc351d6d3bee193b9f8507657
author Marcin Kosiba <mkosiba@google.com> Thu Jul 31 11:18:35 2014 +0100
committer Ben Murdoch <benm@google.com> Fri Aug 01 12:38:57 2014 +0100
tree daedd2b5e048781264515ee5bf59c10741e6ec0f
parent e48bcd63f05c6f42888fc6958ab565bbc0e37a26

Cherry pick Generate resources before running aapt.

This adds the dependency needed to generate resources before running
AAPT on them.

Original Change-Id: I43787cb6c883a2b57c19b1348b684264c3b3bc0a

Bug: 16723226
Change-Id: I3d03e76518a14fbd65fd866615d89155fa5fe8a7

chromium/Android.mk

diff --git a/chromium/Android.mk b/chromium/Android.mk
index 517ad1b..1052702 100644
--- a/chromium/Android.mk
+++ b/chromium/Android.mk
@@ -63,6 +63,9 @@
 
 $(LOCAL_BUILT_MODULE): $(android_webview_intermediates_pak_additional_deps)
 $(LOCAL_BUILT_MODULE): PRIVATE_ASSET_DIR += $(android_webview_asset_dirs)
+# This is needed to force the grd->string.xml conversion to run before we
+# attempt to generate the R.java file.
+$(R_file_stamp): $(call intermediates-dir-for,GYP,android_webview_resources)/android_webview_resources.stamp
 
 ifneq ($(strip $(LOCAL_JARJAR_RULES)),)
 # Add build rules to check that the jarjar'ed jar only contains whitelisted