From 262491b0a86da67ed0e2a596ba2123322194788f Mon Sep 17 00:00:00 2001 From: Sasha Smundak Date: Tue, 19 May 2020 17:36:56 -0700 Subject: [PATCH] Do not fail if unzip found no files to extract Fixes: 157081961 Test: manual Change-Id: Ib84c9fa1ceb45542ebcee14e048ecf2c1783c0c0 Merged-In: Ib84c9fa1ceb45542ebcee14e048ecf2c1783c0c0 --- core/soong_android_app_set.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/soong_android_app_set.mk b/core/soong_android_app_set.mk index e84371ca6..4c27e5346 100644 --- a/core/soong_android_app_set.mk +++ b/core/soong_android_app_set.mk @@ -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))