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

Commit 920000e5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update language to comply with inclusive guidance" am: bf0c1b7b am:... 

Merge "Update language to comply with inclusive guidance" am: bf0c1b7b am: d844b36c am: a15525a0

Original change: https://android-review.googlesource.com/c/platform/build/+/1375361

Change-Id: I81b48ce0f3cb9f14261c236610d3d1dda46c7cb3
parents a68356b4 a15525a0

core/clear_vars.mk

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ LOCAL_ANNOTATION_PROCESSOR_CLASSES:= 
LOCAL_APIDIFF_NEWAPI:=

LOCAL_APIDIFF_OLDAPI:=

LOCAL_APK_LIBRARIES:=

LOCAL_APK_SET_MASTER_FILE:=

LOCAL_APK_SET_INSTALL_FILE:=

LOCAL_APKCERTS_FILE:=

LOCAL_ARM_MODE:=

LOCAL_ASFLAGS:=

core/soong_android_app_set.mk

+8 −8
Original line number Diff line number Diff line 
# App prebuilt coming from Soong.

# Extra inputs:

# LOCAL_APK_SET_MASTER_FILE

# LOCAL_APK_SET_INSTALL_FILE



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_MASTER_FILE)

LOCAL_INSTALLED_MODULE_STEM := $(LOCAL_APK_SET_MASTER_FILE)

LOCAL_BUILT_MODULE_STEM := $(LOCAL_APK_SET_INSTALL_FILE)

LOCAL_INSTALLED_MODULE_STEM := $(LOCAL_APK_SET_INSTALL_FILE)



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

include $(BUILD_SYSTEM)/base_rules.mk
@@ -15,19 +15,19 @@ include $(BUILD_SYSTEM)/base_rules.mk 


## Extract master APK from APK set into given directory

# $(1) APK set

# $(2) master APK entry (e.g., splits/base-master.apk

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



define extract-master-from-apk-set

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

$(LOCAL_BUILT_MODULE): $(1)

	@echo "Extracting $$@"

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

endef



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

$(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_MASTER_FILE) has is already there.

# $(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_MASTER_FILE) || [[ $$? -eq 11 ]]

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

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

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