openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Update language to comply with inclusive guidance"

This commit is contained in:
Treehugger Robot 2020-07-31 22:50:49 +00:00 committed by Gerrit Code Review
parent 3a9bd34ec2 9dd20038b2
commit bf0c1b7b77
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/clear_vars.mk
View File

@ -21,7 +21,7 @@ LOCAL_ANNOTATION_PROCESSOR_CLASSES:=
LOCAL_APIDIFF_NEWAPI:= LOCAL_APIDIFF_NEWAPI:=
LOCAL_APIDIFF_OLDAPI:= LOCAL_APIDIFF_OLDAPI:=
LOCAL_APK_LIBRARIES:= LOCAL_APK_LIBRARIES:=
LOCAL_APK_SET_MASTER_FILE:= LOCAL_APK_SET_INSTALL_FILE:=
LOCAL_APKCERTS_FILE:= LOCAL_APKCERTS_FILE:=
LOCAL_ARM_MODE:= LOCAL_ARM_MODE:=
LOCAL_ASFLAGS:= LOCAL_ASFLAGS:=

16
core/soong_android_app_set.mk
View File

@ -1,13 +1,13 @@
# App prebuilt coming from Soong. # App prebuilt coming from Soong.
# Extra inputs: # Extra inputs:
# LOCAL_APK_SET_MASTER_FILE # LOCAL_APK_SET_INSTALL_FILE
ifneq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK)) ifneq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK))
$(call pretty-error,soong_apk_set.mk may only be used from Soong) $(call pretty-error,soong_apk_set.mk may only be used from Soong)
endif endif
LOCAL_BUILT_MODULE_STEM := $(LOCAL_APK_SET_MASTER_FILE) LOCAL_BUILT_MODULE_STEM := $(LOCAL_APK_SET_INSTALL_FILE)
LOCAL_INSTALLED_MODULE_STEM := $(LOCAL_APK_SET_MASTER_FILE) LOCAL_INSTALLED_MODULE_STEM := $(LOCAL_APK_SET_INSTALL_FILE)
####################################### #######################################
include $(BUILD_SYSTEM)/base_rules.mk 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 ## Extract master APK from APK set into given directory
# $(1) APK set # $(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) $(LOCAL_BUILT_MODULE): $(1)
@echo "Extracting $$@" @echo "Extracting $$@"
unzip -pq $$< $(2) >$$@ unzip -pq $$< $(2) >$$@
endef 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, # 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_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) $(LOCAL_INSTALLED_MODULE): PRIVATE_POST_INSTALL_CMD := $(LOCAL_POST_INSTALL_CMD)
PACKAGES.$(LOCAL_MODULE).OVERRIDES := $(strip $(LOCAL_OVERRIDES_PACKAGES)) PACKAGES.$(LOCAL_MODULE).OVERRIDES := $(strip $(LOCAL_OVERRIDES_PACKAGES))