commit 1465806ff292e0d93e43a6772aff66d2c880103c
author Colin Cross <ccross@android.com> Tue May 15 16:04:47 2018 -0700
committer Colin Cross <ccross@android.com> Tue May 15 16:04:47 2018 -0700
tree 26f67f1f1df00ebcbb10db6865e46f85ee56580c
parent d443244fbf3ee02f6d370509c83e39c2046ac4dd

Fix incorrect renderscript zip deps

Fix some incorrect dependencies after I12d33e52019aebac6ea33271939228e4690a4173.

Bug: 73885582
Test: m java FORCE_AAPT2=true
Change-Id: Ica2758991603e1605f629d843d19df5e2ef4fae1

core/package_internal.mk

diff --git a/core/package_internal.mk b/core/package_internal.mk
index 62cb4f3..64e9fe1 100644
--- a/core/package_internal.mk
+++ b/core/package_internal.mk
@@ -416,7 +416,7 @@
     $(resource_export_package): PRIVATE_PRODUCT_AAPT_CONFIG :=
     $(resource_export_package): PRIVATE_PRODUCT_AAPT_PREF_CONFIG :=
     $(resource_export_package): PRIVATE_RESOURCE_LIST := $(all_res_assets)
-    $(resource_export_package): $(all_res_assets) $(full_android_manifest) $(RenderScript_file_stamp) $(AAPT)
+    $(resource_export_package): $(all_res_assets) $(full_android_manifest) $(rs_generated_res_zip) $(AAPT)
 	@echo "target Export Resources: $(PRIVATE_MODULE) ($@)"
 	$(create-empty-package)
 	$(add-assets-to-package)