[android_webview] Fix android_webview_resources dependency.

We need the android_webview_resources stamp file to be a dependency
of the R_file_stamp to force the resources to be generated before
we invoke AAPT on them.
LOCAL_ADDITIONAL_DEPENDENCIES was insufficient since that would
force generating the resources at a later stage.

BUG=393825
R=torne@chromium.org

Review URL: https://codereview.chromium.org/432753002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@286762 0039d316-1c4b-4281-b951-d872f2087c98

android_webview/Android.mk

@@ -37,11 +37,6 @@ LOCAL_MODULE := android_webview_java_with_new_resources
 
 LOCAL_MODULE_TAGS := optional
 
-# Depend on the android_webview_strings target to ensure the grd->string.xml
-# processing takes place.
-LOCAL_ADDITIONAL_DEPENDENCIES := \
-    $(call intermediates-dir-for,GYP,android_webview_resources)/android_webview_resources.stamp
-
 include $(LOCAL_PATH)/java_library_common.mk
 
 # resources
@@ -52,6 +47,10 @@ LOCAL_AAPT_FLAGS := $(android_webview_aapt_flags)
 
 include $(BUILD_STATIC_JAVA_LIBRARY)
 
+# Depend on the android_webview_strings target to ensure the grd->string.xml
+# processing takes place.
+$(R_file_stamp): $(android_webview_resources_stamp)
+
 ########################################################
 # These packages are the resource paks used by webview.
 

android_webview/build/resources_config.mk

@@ -97,3 +97,7 @@ android_webview_final_pak_names := \
 android_webview_intermediates_pak_additional_deps := \
   $(foreach name,$(android_webview_final_pak_names), \
     $(call intermediates-dir-for,APPS,webviewchromium-paks)/$(name))
+
+# This is the stamp file for the android_webview_resources target.
+android_webview_resources_stamp := \
+  $(call intermediates-dir-for,GYP,android_webview_resources)/android_webview_resources.stamp