diff options
| author | mkosiba@chromium.org <mkosiba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-27 13:51:52 +0000 |
|---|---|---|
| committer | mkosiba@chromium.org <mkosiba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-27 13:51:52 +0000 |
| commit | 6c157457d3bc53353e31eab25daea073a716497b (patch) | |
| tree | 406eb11eb4305fc8af784f7cfcc30ef9d89564ea /android_webview/Android.mk | |
| parent | 38d510dcd2db695caa5101ebe70553b83dda2ebb (diff) | |
| download | chromium_src-6c157457d3bc53353e31eab25daea073a716497b.zip chromium_src-6c157457d3bc53353e31eab25daea073a716497b.tar.gz chromium_src-6c157457d3bc53353e31eab25daea073a716497b.tar.bz2 | |
[android_webview] Fix Android.mk module dependencies.
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
Diffstat (limited to 'android_webview/Android.mk')
| -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 2d1306a..32e7654 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 |