Make change and version bump to RM1A.200520.001 (4e310409) · Commits · e / os / android_build

core/Makefile

+22 −7

Original line number	Diff line number	Diff line
		@@ -1124,6 +1124,15 @@ else
		BUILT_BOOTIMAGE_TARGET := $(PRODUCT_OUT)/boot.img
		endif

		ifdef BOARD_BOOTIMAGE_PARTITION_SIZE
		BOARD_KERNEL_BOOTIMAGE_PARTITION_SIZE := $(BOARD_BOOTIMAGE_PARTITION_SIZE)
		endif

		# $1: boot image file name
		# $2: boot image variant (boot, boot-debug)
		define get-bootimage-partition-size
		$(BOARD_$(call to-upper,$(subst .img,,$(subst $(2),kernel,$(notdir $(1)))))_BOOTIMAGE_PARTITION_SIZE)
		endef

		ifneq ($(strip $(TARGET_NO_KERNEL)),true)
		INTERNAL_BOOTIMAGE_ARGS := \
		@@ -2172,11 +2181,11 @@ define build-recoveryimage-target
		$(if $(filter true,$(PRODUCT_SUPPORTS_VBOOT)), \
		$(VBOOT_SIGNER) $(FUTILITY) $(1).unsigned $(PRODUCT_VBOOT_SIGNING_KEY).vbpubk $(PRODUCT_VBOOT_SIGNING_KEY).vbprivk $(PRODUCT_VBOOT_SIGNING_SUBKEY).vbprivk $(1).keyblock $(1))
		$(if $(filter true,$(BOARD_USES_RECOVERY_AS_BOOT)), \
		$(call assert-max-image-size,$(1),$(call get-hash-image-max-size,$(BOARD_BOOTIMAGE_PARTITION_SIZE))), \
		$(call assert-max-image-size,$(1),$(call get-hash-image-max-size,$(call get-bootimage-partition-size,$(1),boot))), \
		$(call assert-max-image-size,$(1),$(call get-hash-image-max-size,$(BOARD_RECOVERYIMAGE_PARTITION_SIZE))))
		$(if $(filter true,$(BOARD_AVB_ENABLE)), \
		$(if $(filter true,$(BOARD_USES_RECOVERY_AS_BOOT)), \
		$(AVBTOOL) add_hash_footer --image $(1) --partition_size $(BOARD_BOOTIMAGE_PARTITION_SIZE) --partition_name boot $(INTERNAL_AVB_BOOT_SIGNING_ARGS) $(BOARD_AVB_BOOT_ADD_HASH_FOOTER_ARGS),\
		$(AVBTOOL) add_hash_footer --image $(1) --partition_size $(call get-bootimage-partition-size,$(1),boot) --partition_name boot $(INTERNAL_AVB_BOOT_SIGNING_ARGS) $(BOARD_AVB_BOOT_ADD_HASH_FOOTER_ARGS),\
		$(AVBTOOL) add_hash_footer --image $(1) --partition_size $(BOARD_RECOVERYIMAGE_PARTITION_SIZE) --partition_name recovery $(INTERNAL_AVB_RECOVERY_SIGNING_ARGS) $(BOARD_AVB_RECOVERY_ADD_HASH_FOOTER_ARGS)))
		endef

		@@ -2363,13 +2372,13 @@ BOARD_AVB_BOOT_TEST_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem
		INTERNAL_AVB_BOOT_TEST_SIGNING_ARGS := --algorithm SHA256_RSA2048 --key $(BOARD_AVB_BOOT_TEST_KEY_PATH)
		# $(1): the bootimage to sign
		define test-key-sign-bootimage
		$(call assert-max-image-size,$(1),$(call get-hash-image-max-size,$(BOARD_BOOTIMAGE_PARTITION_SIZE)))
		$(call assert-max-image-size,$(1),$(call get-hash-image-max-size,$(call get-bootimage-partition-size,$(1),boot-debug)))
		$(AVBTOOL) add_hash_footer \
		--image $(1) \
		--partition_size $(BOARD_BOOTIMAGE_PARTITION_SIZE) \
		--partition_size $(call get-bootimage-partition-size,$(1),boot-debug)\
		--partition_name boot $(INTERNAL_AVB_BOOT_TEST_SIGNING_ARGS) \
		$(BOARD_AVB_BOOT_ADD_HASH_FOOTER_ARGS)
		$(call assert-max-image-size,$(1),$(BOARD_BOOTIMAGE_PARTITION_SIZE))
		$(call assert-max-image-size,$(1),$(call get-bootimage-partition-size,$(1),boot-debug))
		endef

		# $(1): output file
		@@ -4115,6 +4124,11 @@ tool_extensions := $(TARGET_RELEASETOOLS_EXTENSIONS)
		endif
		.KATI_READONLY := tool_extensions

		# $1: boot image file name
		define misc_boot_size
		$(subst .img,_size,$(1))=$(BOARD_KERNEL$(call to-upper,$(subst boot,,$(subst .img,,$(1))))_BOOTIMAGE_PARTITION_SIZE)
		endef

		$(INSTALLED_MISC_INFO_TARGET):
		rm -f $@
		$(call pretty,"Target misc_info.txt: $@")
		@@ -4123,8 +4137,9 @@ $(INSTALLED_MISC_INFO_TARGET):
		ifdef BOARD_FLASH_BLOCK_SIZE
		$(hide) echo "blocksize=$(BOARD_FLASH_BLOCK_SIZE)" >> $@
		endif
		ifdef BOARD_BOOTIMAGE_PARTITION_SIZE
		$(hide) echo "boot_size=$(BOARD_BOOTIMAGE_PARTITION_SIZE)" >> $@
		ifneq ($(strip $(BOARD_BOOTIMAGE_PARTITION_SIZE))$(strip $(BOARD_KERNEL_BINARIES)),)
		$(foreach b,$(INSTALLED_BOOTIMAGE_TARGET),\
		echo "$(call misc_boot_size,$(notdir $(b)))" >> $@;)
		endif
		ifeq ($(INSTALLED_BOOTIMAGE_TARGET),)
		$(hide) echo "no_boot=true" >> $@

core/build_id.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -18,4 +18,4 @@
		# (like "CRB01"). It must be a single word, and is
		# capitalized by convention.

		BUILD_ID=RM1A.200519.001
		BUILD_ID=RM1A.200520.001

core/tasks/vts-core-tests.mk

+3 −6

Original line number	Diff line number	Diff line
		@@ -12,15 +12,13 @@
		# See the License for the specific language governing permissions and
		# limitations under the License.

		-include external/linux-kselftest/android/kselftest_test_list.mk
		-include external/ltp/android/ltp_package_list.mk

		test_suite_name := vts
		test_suite_tradefed := vts-tradefed
		test_suite_readme := test/vts/tools/vts-core-tradefed/README

		# TODO(b/149249068): Clean up after all VTS tests are converted.
		vts_test_artifact_paths :=
		# Some repo may not include vts project.
		-include test/vts/tools/build/tasks/framework/vts_for_core_suite.mk

		# Copy kernel test modules to testcases directories
		kernel_test_host_out := $(HOST_OUT_TESTCASES)/vts_kernel_tests
		kernel_test_vts_out := $(HOST_OUT)/$(test_suite_name)/android-$(test_suite_name)/testcases/vts_kernel_tests
		@@ -44,7 +42,6 @@ include $(BUILD_SYSTEM)/tasks/tools/compatibility.mk
		$(compatibility_zip): $(copy_kernel_tests)

		.PHONY: vts
		$(compatibility_zip): $(vts_test_artifact_paths)
		vts: $(compatibility_zip)
		$(call dist-for-goals, vts, $(compatibility_zip))

target/board/generic_arm64/BoardConfig.mk

+3 −1

Original line number	Diff line number	Diff line
		@@ -58,7 +58,9 @@ TARGET_NO_KERNEL := false
		TARGET_NO_VENDOR_BOOT := true
		BOARD_USES_RECOVERY_AS_BOOT := true

		BOARD_BOOTIMAGE_PARTITION_SIZE := 0x04000000
		BOARD_KERNEL-5.4_BOOTIMAGE_PARTITION_SIZE := 67108864
		BOARD_KERNEL-5.4-GZ_BOOTIMAGE_PARTITION_SIZE := 47185920
		BOARD_KERNEL-5.4-LZ4_BOOTIMAGE_PARTITION_SIZE := 53477376
		BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800

		BOARD_BOOT_HEADER_VERSION := 3

target/product/base_system.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -211,7 +211,7 @@ PRODUCT_PACKAGES += \
		mtpd \
		ndc \
		netd \
		NetworkStackNext \
		NetworkStack \
		org.apache.http.legacy \
		otacerts \
		PackageInstaller \