commit 9a6d03d55ef15578ede63ce8253a2271527aa4ba
author Sandeep Vijayasekar <sandv@google.com> Wed Jul 20 15:08:33 2022 -0700
committer Sandeep Vijayasekar <sandv@google.com> Mon Jul 25 14:51:24 2022 -0700
tree 96a0111164d84428cb4cb5a59aac1616dbbf6477
parent 2c3c189da712a6c53f03f814306d611742f106b4

Fix signapk jar not found for prebuilt splits

Bug: 132211754
Bug: 232129462
Test: prebuild module with LOCAL_PACKAGE_SPLITS defined
Change-Id: If82f06debf092fd5bdf37558d8eea62eb3b72582
(cherry picked from commit 1e3a2c32543af2b93741ca3bee75e2cc5af04301)

core/app_prebuilt_internal.mk

diff --git a/core/app_prebuilt_internal.mk b/core/app_prebuilt_internal.mk
index 79639a8..8d057ac 100644
--- a/core/app_prebuilt_internal.mk
+++ b/core/app_prebuilt_internal.mk
@@ -275,7 +275,7 @@
 endif
 my_src_dir := $(LOCAL_PATH)/$(my_src_dir)
 
-$(built_apk_splits) : $(LOCAL_CERTIFICATE).pk8 $(LOCAL_CERTIFICATE).x509.pem
+$(built_apk_splits) : $(LOCAL_CERTIFICATE).pk8 $(LOCAL_CERTIFICATE).x509.pem | $(ZIPALIGN) $(ZIP2ZIP) $(SIGNAPK_JAR) $(SIGNAPK_JNI_LIBRARY_PATH)
 $(built_apk_splits) : PRIVATE_PRIVATE_KEY := $(LOCAL_CERTIFICATE).pk8
 $(built_apk_splits) : PRIVATE_CERTIFICATE := $(LOCAL_CERTIFICATE).x509.pem
 $(built_apk_splits) : $(intermediates)/%.apk : $(my_src_dir)/%.apk