pa-fazil
/
android_build
mirror of https://github.com/fazilsheik96/android_build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
android_build/core/soong_android_app_set.mk

40 lines
1.5 KiB
Makefile
Raw Normal View History

Implement android_app_set module. Bug: 152319766 Test: manual and builtin Change-Id: I66edc5b423898a11dbba1c3d9796c7bd4d6b4428
2020-05-06 05:07:24 +00:00
# App prebuilt coming from Soong.
# Extra inputs:
Update language to comply with inclusive guidance Update android_app_set make files to use INSTALL rather than MASTER for android_app_sets, this better matches the wording used for apex_set. See https://source.android.com/setup/contribute/respectful-code for reference Bug: 161896447 Test: m nothing Change-Id: I7f37a72914f4b18a839942cc3db98b1c57db921e
2020-07-28 21:21:14 +00:00
# LOCAL_APK_SET_INSTALL_FILE
Implement android_app_set module. Bug: 152319766 Test: manual and builtin Change-Id: I66edc5b423898a11dbba1c3d9796c7bd4d6b4428
2020-05-06 05:07:24 +00:00
ifneq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK))
$(call pretty-error,soong_apk_set.mk may only be used from Soong)
endif
Update language to comply with inclusive guidance Update android_app_set make files to use INSTALL rather than MASTER for android_app_sets, this better matches the wording used for apex_set. See https://source.android.com/setup/contribute/respectful-code for reference Bug: 161896447 Test: m nothing Change-Id: I7f37a72914f4b18a839942cc3db98b1c57db921e
2020-07-28 21:21:14 +00:00
LOCAL_BUILT_MODULE_STEM := $(LOCAL_APK_SET_INSTALL_FILE)
LOCAL_INSTALLED_MODULE_STEM := $(LOCAL_APK_SET_INSTALL_FILE)
Implement android_app_set module. Bug: 152319766 Test: manual and builtin Change-Id: I66edc5b423898a11dbba1c3d9796c7bd4d6b4428
2020-05-06 05:07:24 +00:00
#######################################
include $(BUILD_SYSTEM)/base_rules.mk
#######################################
## Extract master APK from APK set into given directory
# $(1) APK set
Update language to comply with inclusive guidance Update android_app_set make files to use INSTALL rather than MASTER for android_app_sets, this better matches the wording used for apex_set. See https://source.android.com/setup/contribute/respectful-code for reference Bug: 161896447 Test: m nothing Change-Id: I7f37a72914f4b18a839942cc3db98b1c57db921e
2020-07-28 21:21:14 +00:00
# $(2) APK entry to install (e.g., splits/base.apk
Implement android_app_set module. Bug: 152319766 Test: manual and builtin Change-Id: I66edc5b423898a11dbba1c3d9796c7bd4d6b4428
2020-05-06 05:07:24 +00:00
Update language to comply with inclusive guidance Update android_app_set make files to use INSTALL rather than MASTER for android_app_sets, this better matches the wording used for apex_set. See https://source.android.com/setup/contribute/respectful-code for reference Bug: 161896447 Test: m nothing Change-Id: I7f37a72914f4b18a839942cc3db98b1c57db921e
2020-07-28 21:21:14 +00:00
define extract-install-file-from-apk-set
Implement android_app_set module. Bug: 152319766 Test: manual and builtin Change-Id: I66edc5b423898a11dbba1c3d9796c7bd4d6b4428
2020-05-06 05:07:24 +00:00
$(LOCAL_BUILT_MODULE): $(1)
@echo "Extracting $$@"
unzip -pq $$< $(2) >$$@
endef
Update language to comply with inclusive guidance Update android_app_set make files to use INSTALL rather than MASTER for android_app_sets, this better matches the wording used for apex_set. See https://source.android.com/setup/contribute/respectful-code for reference Bug: 161896447 Test: m nothing Change-Id: I7f37a72914f4b18a839942cc3db98b1c57db921e
2020-07-28 21:21:14 +00:00
$(eval $(call extract-install-file-from-apk-set,$(LOCAL_PREBUILT_MODULE_FILE),$(LOCAL_APK_SET_INSTALL_FILE)))
Do not fail if unzip found no files to extract Fixes: 157081961 Test: manual Change-Id: Ib84c9fa1ceb45542ebcee14e048ecf2c1783c0c0 Merged-In: Ib84c9fa1ceb45542ebcee14e048ecf2c1783c0c0
2020-05-20 00:36:56 +00:00
# unzip returns 11 it there was nothing to extract, which is expected,
Update language to comply with inclusive guidance Update android_app_set make files to use INSTALL rather than MASTER for android_app_sets, this better matches the wording used for apex_set. See https://source.android.com/setup/contribute/respectful-code for reference Bug: 161896447 Test: m nothing Change-Id: I7f37a72914f4b18a839942cc3db98b1c57db921e
2020-07-28 21:21:14 +00:00
# $(LOCAL_APK_SET_INSTALL_FILE) has is already there.
Use unzip -DD We put reproducible timestamps in zip files so that the artifacts are consistent, but that leads to old timestamps in the output directory if they are unzipped as part of the build. Use unzip -DD when unzipping to update the timestamps. Bug: 161015009 Test: touch -d 2020-01-01 ref; find $OUT/system -not -newer ref Change-Id: I6f08ba8695d90a8225cfc04e679755e6296deed0
2020-07-12 05:33:30 +00:00
LOCAL_POST_INSTALL_CMD := unzip -qoDD -j -d $(dir $(LOCAL_INSTALLED_MODULE)) \
Update language to comply with inclusive guidance Update android_app_set make files to use INSTALL rather than MASTER for android_app_sets, this better matches the wording used for apex_set. See https://source.android.com/setup/contribute/respectful-code for reference Bug: 161896447 Test: m nothing Change-Id: I7f37a72914f4b18a839942cc3db98b1c57db921e
2020-07-28 21:21:14 +00:00
$(LOCAL_PREBUILT_MODULE_FILE) -x $(LOCAL_APK_SET_INSTALL_FILE) || [[ $$? -eq 11 ]]
Implement android_app_set module. Bug: 152319766 Test: manual and builtin Change-Id: I66edc5b423898a11dbba1c3d9796c7bd4d6b4428
2020-05-06 05:07:24 +00:00
$(LOCAL_INSTALLED_MODULE): PRIVATE_POST_INSTALL_CMD := $(LOCAL_POST_INSTALL_CMD)
PACKAGES.$(LOCAL_MODULE).OVERRIDES := $(strip $(LOCAL_OVERRIDES_PACKAGES))
Mark android_app_set modules PRESIGNED. Test: m apkcerts-list Fixes: 159921591 Merged-In: Ie83a05be0d71280644843eddffdbea6bcb429c74 Change-Id: Ie83a05be0d71280644843eddffdbea6bcb429c74
2020-06-25 23:06:21 +00:00
PACKAGES := $(PACKAGES) $(LOCAL_MODULE)
Add LOCAL_APKCERTS_FILE support. This is used when Soong and Make don't know the full output file list, and so use a tool to generate a per-module apkcerts.txt file instead. Fixes: 160119159 Test: m apkcerts-list Merged-In: I48183bc8cbf9dcc521f791812734205ed3f28f4c Change-Id: I48183bc8cbf9dcc521f791812734205ed3f28f4c
2020-06-30 02:37:53 +00:00
# We can't know exactly what apk files would be outputted yet.
# Let extract_apks generate apkcerts.txt and merge it later.
PACKAGES.$(LOCAL_MODULE).APKCERTS_FILE := $(LOCAL_APKCERTS_FILE)
Mark android_app_set modules PRESIGNED. Test: m apkcerts-list Fixes: 159921591 Merged-In: Ie83a05be0d71280644843eddffdbea6bcb429c74 Change-Id: Ie83a05be0d71280644843eddffdbea6bcb429c74
2020-06-25 23:06:21 +00:00
More performance improvements Instead of using `x := $(x) foo`, make sure `x` is initialized first, then use `x += foo`. For a aosp-master/aosp_crosshatch-userdebug build, this takes the build from 49s to 33s (no significant difference in peak memory) Bug: 158488548 Test: build-aosp_crosshatch.ninja is the same before/after Change-Id: I41fb7611030dd3ba824f896a9c9eadbdd218f464
2020-06-09 01:50:14 +00:00
SOONG_ALREADY_CONV += $(LOCAL_MODULE)