diff options
| author | mkosiba@chromium.org <mkosiba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-27 13:51:52 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-07-01 16:44:50 +0100 |
| commit | f35c392caf6898039307022046411d05049009c4 (patch) | |
| tree | ef133c6378969fa4aa6f7adecb4ecd7e0d5f7ca8 | |
| parent | 3a3813145f1a83bf03a1c0ba55c41393f7e25ba8 (diff) | |
| download | chromium_org-f35c392caf6898039307022046411d05049009c4.tar.gz | |
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
| -rw-r--r-- | android_webview/Android.mk | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/android_webview/Android.mk b/android_webview/Android.mk index 2d1306aee5..32e76541e2 100644 --- a/android_webview/Android.mk +++ b/android_webview/Android.mk @@ -13,7 +13,12 @@ LOCAL_MODULE := android_webview_java 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 |