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

Commit 5026328d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Do not fail if unzip found no files to extract" into rvc-dev am: df865a9a 

Change-Id: I76ce0b5e71dbc6fd4caa8dbba8a3603241ab1335
parents b15e284a df865a9a

core/soong_android_app_set.mk

+3 −1
Original line number Diff line number Diff line
@@ -24,8 +24,10 @@ $(LOCAL_BUILT_MODULE): $(1) 
endef



$(eval $(call extract-master-from-apk-set,$(LOCAL_PREBUILT_MODULE_FILE),$(LOCAL_APK_SET_MASTER_FILE)))

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

# $(LOCAL_APK_SET_MASTER_FILE) has is already there.

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

	$(LOCAL_PREBUILT_MODULE_FILE) -x $(LOCAL_APK_SET_MASTER_FILE)

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

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

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