diff options
| author | Ben Murdoch <benm@google.com> | 2014-08-01 13:16:18 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2014-08-01 13:16:18 +0100 |
| commit | c2d8e69cdea237921c367377d039762676e42d8b (patch) | |
| tree | 6863a1c2ae604fa2f42c01eb347faedf8ac3d97a /android_webview/Android.mk | |
| parent | 1081061c0408a6d2edb37969f8c29049b6b32eeb (diff) | |
| download | chromium_org-c2d8e69cdea237921c367377d039762676e42d8b.tar.gz | |
Cherry pick [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
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=286762
Bug: 16723226
Change-Id: Iadeac1b0fb80f49a1e30d3969184278ab441795e
Diffstat (limited to 'android_webview/Android.mk')
| -rw-r--r-- | android_webview/Android.mk | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/android_webview/Android.mk b/android_webview/Android.mk index 32e76541e2..84e1364793 100644 --- a/android_webview/Android.mk +++ b/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,,,$(TARGET_2ND_ARCH))/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. |