From 1b391c002de0c30360ae4e8e7583046eefcd9d0a Mon Sep 17 00:00:00 2001 From: Alex Klyubin Date: Thu, 15 Dec 2016 12:51:25 -0800 Subject: [PATCH] aapt no longer needed for signing APKs signapk now auto-detects the APK's minSdkVersion, removing the need to run aapt dump badging during APK signing. Test: make clean && make Change-Id: Ifc74292a9900443d053e437b50b540c8d0b33dbd --- core/prebuilt_internal.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/prebuilt_internal.mk b/core/prebuilt_internal.mk index d9f9ea8d8..10512ff32 100644 --- a/core/prebuilt_internal.mk +++ b/core/prebuilt_internal.mk @@ -299,7 +299,7 @@ embedded_prebuilt_jni_libs := 'lib/*.so' endif $(built_module): PRIVATE_EMBEDDED_JNI_LIBS := $(embedded_prebuilt_jni_libs) -$(built_module) : $(my_prebuilt_src_file) | $(ZIPALIGN) $(SIGNAPK_JAR) $(AAPT) +$(built_module) : $(my_prebuilt_src_file) | $(ZIPALIGN) $(SIGNAPK_JAR) $(transform-prebuilt-to-target) $(uncompress-shared-libs) ifdef LOCAL_DEX_PREOPT @@ -346,7 +346,7 @@ my_src_dir := $(LOCAL_PATH)/$(my_src_dir) $(built_apk_splits) : $(LOCAL_CERTIFICATE).pk8 $(LOCAL_CERTIFICATE).x509.pem $(built_apk_splits) : PRIVATE_PRIVATE_KEY := $(LOCAL_CERTIFICATE).pk8 $(built_apk_splits) : PRIVATE_CERTIFICATE := $(LOCAL_CERTIFICATE).x509.pem -$(built_apk_splits) : $(built_module_path)/%.apk : $(my_src_dir)/%.apk | $(AAPT) +$(built_apk_splits) : $(built_module_path)/%.apk : $(my_src_dir)/%.apk $(copy-file-to-new-target) $(sign-package) -- 2.11.0