commit 15bdbeece5d7e14ab59825f796034449a2468511
author mkosiba@chromium.org <mkosiba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri Jun 27 13:51:52 2014 +0000
committer Torne (Richard Coles) <torne@google.com> Tue Jul 01 14:32:34 2014 +0100
tree 0c6a995755828efd20ed19ec46c6579ff1858243
parent 612d2de5766e6fd517863e969a7ef268b626d63d

Cherrypick: [android_webview] Fix Android.mk module dependencies.

Cherrypick Chromium r280319 to fix constant rebuilds of
android_webview_java:

> LOCAL_ADDITIONAL_DEPENDENCIES works on the file level, not phony
> target level, so the current rule results in rebuilding the
> android_webview_java target whenever we run make.
>
> BUG=389534
> TEST=compile on android_aosp bot
> NOTRY=true
>
> Review URL: https://codereview.chromium.org/332343007
>
> git-svn-id: svn://svn.chromium.org/chrome/trunk/src@280319 0039d316-1c4b-4281-b951-d872f2087c98

Bug: 15598761
Change-Id: I6a1da1a1ee829e962ada76107fb0109aac0c8da5

android_webview/Android.mk

diff --git a/android_webview/Android.mk b/android_webview/Android.mk
index 2d1306a..32e7654 100644
--- a/android_webview/Android.mk
+++ b/android_webview/Android.mk
@@ -13,7 +13,12 @@
 
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_ADDITIONAL_DEPENDENCIES := android_webview_java_with_new_resources
+# Temporary extra dependency: force android_webview_java_with_new_resources to
+# be built whenever this target is built, so that we get build coverage until
+# the switch happens.
+LOCAL_ADDITIONAL_DEPENDENCIES := \
+    $(call intermediates-dir-for,JAVA_LIBRARIES,android_webview_java_with_new_resources,,COMMON)/javalib.jar
+
 
 include $(LOCAL_PATH)/java_library_common.mk
 # resource glue layer