Fix issue #2048267: Run zipalign on all prebuilts
diff --git a/core/prebuilt.mk b/core/prebuilt.mk
index 6df276c..34d2453 100644
--- a/core/prebuilt.mk
+++ b/core/prebuilt.mk
@@ -26,6 +26,11 @@
prebuilt_module_is_a_library :=
endif
+# Ensure that prebuilt .apks have been aligned.
+ifneq ($(filter APPS,$(LOCAL_MODULE_CLASS)),)
+$(LOCAL_BUILT_MODULE) : $(LOCAL_PATH)/$(LOCAL_SRC_FILES) | $(ZIPALIGN)
+ $(transform-prebuilt-to-target-with-zipalign)
+else
ifneq ($(LOCAL_PREBUILT_STRIP_COMMENTS),)
$(LOCAL_BUILT_MODULE) : $(LOCAL_PATH)/$(LOCAL_SRC_FILES)
$(transform-prebuilt-to-target-strip-comments)
@@ -33,6 +38,8 @@
$(LOCAL_BUILT_MODULE) : $(LOCAL_PATH)/$(LOCAL_SRC_FILES) | $(ACP)
$(transform-prebuilt-to-target)
endif
+endif
+
ifneq ($(prebuilt_module_is_a_library),)
ifneq ($(LOCAL_IS_HOST_MODULE),)
$(transform-host-ranlib-copy-hack)