Snap for 6643974 from 77aeee302f2961934ec7b8491c0657541e9615a8 to mainline-release (f76c58cb) · Commits · e / os / android_build

core/Makefile

+17 −3

Original line number	Diff line number	Diff line
		@@ -912,6 +912,16 @@ $(hide) echo '' >> $6

		endef

		# -----------------------------------------------------------------
		# Merge an individual apkcerts output into the final apkcerts.txt output.
		# Use a macro to make it compatible with _apkcerts_write_line
		# $1 apkcerts file to be merged
		# $2 output file
		define _apkcerts_merge
		$(hide) cat $1 >> $2

		endef

		name := $(TARGET_PRODUCT)
		ifeq ($(TARGET_BUILD_TYPE),debug)
		name := $(name)_debug
		@@ -920,6 +930,8 @@ name := $(name)-apkcerts-$(FILE_NAME_TAG)
		intermediates := \
		$(call intermediates-dir-for,PACKAGING,apkcerts)
		APKCERTS_FILE := $(intermediates)/$(name).txt
		all_apkcerts_files := $(sort $(foreach p,$(PACKAGES),$(PACKAGES.$(p).APKCERTS_FILE)))
		$(APKCERTS_FILE): $(all_apkcerts_files)
		# We don't need to really build all the modules.
		# TODO: rebuild APKCERTS_FILE if any app change its cert.
		$(APKCERTS_FILE):
		@@ -927,9 +939,11 @@ $(APKCERTS_FILE):
		@mkdir -p $(dir $@)
		@rm -f $@
		$(foreach p,$(sort $(PACKAGES)),\
		$(if $(PACKAGES.$(p).APKCERTS_FILE),\
		$(call _apkcerts_merge,$(PACKAGES.$(p).APKCERTS_FILE), $@),\
		$(if $(PACKAGES.$(p).EXTERNAL_KEY),\
		$(call _apkcerts_write_line,$(PACKAGES.$(p).STEM),"EXTERNAL","",$(PACKAGES.$(p).COMPRESSED),$(PACKAGES.$(p).PARTITION),$@),\
		$(call _apkcerts_write_line,$(PACKAGES.$(p).STEM),$(PACKAGES.$(p).CERTIFICATE),$(PACKAGES.$(p).PRIVATE_KEY),$(PACKAGES.$(p).COMPRESSED),$(PACKAGES.$(p).PARTITION),$@)))
		$(call _apkcerts_write_line,$(PACKAGES.$(p).STEM),$(PACKAGES.$(p).CERTIFICATE),$(PACKAGES.$(p).PRIVATE_KEY),$(PACKAGES.$(p).COMPRESSED),$(PACKAGES.$(p).PARTITION),$@))))
		# In case value of PACKAGES is empty.
		$(hide) touch $@

core/clear_vars.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ LOCAL_APIDIFF_NEWAPI:=
		LOCAL_APIDIFF_OLDAPI:=
		LOCAL_APK_LIBRARIES:=
		LOCAL_APK_SET_MASTER_FILE:=
		LOCAL_APKCERTS_FILE:=
		LOCAL_ARM_MODE:=
		LOCAL_ASFLAGS:=
		LOCAL_ASSET_DIR:=

core/soong_android_app_set.mk

+3 −11

Original line number	Diff line number	Diff line
		@@ -31,17 +31,9 @@ LOCAL_POST_INSTALL_CMD := unzip -qo -j -d $(dir $(LOCAL_INSTALLED_MODULE)) \
		$(LOCAL_INSTALLED_MODULE): PRIVATE_POST_INSTALL_CMD := $(LOCAL_POST_INSTALL_CMD)
		PACKAGES.$(LOCAL_MODULE).OVERRIDES := $(strip $(LOCAL_OVERRIDES_PACKAGES))

		# android_app_set modules are always presigned
		PACKAGES.$(LOCAL_MODULE).CERTIFICATE := PRESIGNED
		PACKAGES := $(PACKAGES) $(LOCAL_MODULE)

		ifneq ($(LOCAL_MODULE_STEM),)
		PACKAGES.$(LOCAL_MODULE).STEM := $(LOCAL_MODULE_STEM)
		else
		PACKAGES.$(LOCAL_MODULE).STEM := $(LOCAL_MODULE)
		endif

		# Set a actual_partition_tag (calculated in base_rules.mk) for the package.
		PACKAGES.$(LOCAL_MODULE).PARTITION := $(actual_partition_tag)
		# 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)

		SOONG_ALREADY_CONV += $(LOCAL_MODULE)

core/version_defaults.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -240,7 +240,7 @@ ifndef PLATFORM_SECURITY_PATCH
		# It must be of the form "YYYY-MM-DD" on production devices.
		# It must match one of the Android Security Patch Level strings of the Public Security Bulletins.
		# If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.
		PLATFORM_SECURITY_PATCH := 2020-08-05
		PLATFORM_SECURITY_PATCH := 2020-09-01
		endif
		.KATI_READONLY := PLATFORM_SECURITY_PATCH

tools/releasetools/edify_generator.py

+3 −3

Original line number	Diff line number	Diff line
		@@ -374,12 +374,12 @@ class EdifyGenerator(object):

		def _CheckSecondTokenNotSlotSuffixed(self, s, fn):
		lst = s.split(':')
		assert(len(s) == 4), "{} does not contain 4 tokens".format(s)
		assert(len(lst) == 4), "{} does not contain 4 tokens".format(s)
		if self.fstab:
		entry = common.GetEntryForDevice(s[1])
		entry = common.GetEntryForDevice(self.fstab, lst[1])
		if entry is not None:
		assert not entry.slotselect, \
		"Use %s because %s is slot suffixed" % (fn, s[1])
		"Use %s because %s is slot suffixed" % (fn, lst[1])

		def WriteRawImage(self, mount_point, fn, mapfn=None):
		"""Write the given package file into the partition for the given