From 9a6d03d55ef15578ede63ce8253a2271527aa4ba Mon Sep 17 00:00:00 2001 From: Sandeep Vijayasekar Date: Wed, 20 Jul 2022 15:08:33 -0700 Subject: [PATCH] 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/app_prebuilt_internal.mk b/core/app_prebuilt_internal.mk index 79639a8301..8d057ac0b4 100644 --- a/core/app_prebuilt_internal.mk +++ b/core/app_prebuilt_internal.mk @@ -275,7 +275,7 @@ $(error You must put all the split source apks in the same folder: $(LOCAL_PACKA 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