Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f42c7d6b authored by Colin Cross's avatar Colin Cross
Browse files

Extract primary APK from apk sets in Soong 

In preparation for Soong handling the installation rules, extract
the primary APK from the apk set in Soong.

Bug: 204136549
Test: build test android_app_set
Change-Id: I416b57009101ca4c05c11102f260e102af13bf0d
parent dacbe7a5

core/soong_android_app_set.mk

+4 −19
Original line number Diff line number Diff line
@@ -6,9 +6,8 @@ ifneq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK)) 
  $(call pretty-error,soong_apk_set.mk may only be used from Soong)

endif



LOCAL_BUILT_MODULE_STEM := $(LOCAL_APK_SET_INSTALL_FILE)

LOCAL_INSTALLED_MODULE_STEM := $(LOCAL_APK_SET_INSTALL_FILE)



LOCAL_BUILT_MODULE_STEM := package.apk

LOCAL_INSTALLED_MODULE_STEM := $(notdir $(LOCAL_PREBUILT_MODULE_FILE))



# Use the Soong output as the checkbuild target instead of LOCAL_BUILT_MODULE

# to avoid checkbuilds making an extra copy of every module.
@@ -18,22 +17,8 @@ LOCAL_CHECKED_MODULE := $(LOCAL_PREBUILT_MODULE_FILE) 
include $(BUILD_SYSTEM)/base_rules.mk

#######################################



## Extract master APK from APK set into given directory

# $(1) APK set

# $(2) APK entry to install (e.g., splits/base.apk



define extract-install-file-from-apk-set

$(LOCAL_BUILT_MODULE): $(1)

	@echo "Extracting $$@"

	unzip -pq $$< $(2) >$$@

endef



$(eval $(call extract-install-file-from-apk-set,$(LOCAL_PREBUILT_MODULE_FILE),$(LOCAL_APK_SET_INSTALL_FILE)))

# unzip returns 11 it there was nothing to extract, which is expected,

# $(LOCAL_APK_SET_INSTALL_FILE) has is already there.

LOCAL_POST_INSTALL_CMD := unzip -qoDD -j -d $(dir $(LOCAL_INSTALLED_MODULE)) \

	$(LOCAL_PREBUILT_MODULE_FILE) -x $(LOCAL_APK_SET_INSTALL_FILE) || [[ $$? -eq 11 ]]

$(LOCAL_INSTALLED_MODULE): PRIVATE_POST_INSTALL_CMD := $(LOCAL_POST_INSTALL_CMD)

$(eval $(call copy-one-file,$(LOCAL_PREBUILT_MODULE_FILE),$(LOCAL_BUILT_MODULE)))



PACKAGES.$(LOCAL_MODULE).OVERRIDES := $(strip $(LOCAL_OVERRIDES_PACKAGES))



PACKAGES := $(PACKAGES) $(LOCAL_MODULE)