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

Commit 9ea1ff9d authored Feb 04, 2025 by Inseob Kim

Add soong module for aosp_{arch}

aosp_{arch} build GSIs for release, whereas gsi_{arch} build GSIs for
compilance test. System images of aosp_{arch} are supersets of system
images of gsi_{arch}, with a few exceptions (userdebug sepolicy).

This adds a Soong module for aosp_{arch} targets, named
aosp_system_image, enabled only when building GSI.

Ignore-AOSP-First: depends on frameworks/base change submitted only on
internal

Bug: 381019944
Test: build, TH
Change-Id: I81b50a038c29bbd1a61fed8044cb600bd22b45e4

parent 0c59be16

core/android_soong_config_vars.mk

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -45,6 +45,7 @@ $(call add_soong_config_var,ANDROID,BOARD_GENFS_LABELS_VERSION)
	$(call soong_config_set_bool,ANDROID,PRODUCT_FSVERITY_GENERATE_METADATA,$(if $(filter true,$(PRODUCT_FSVERITY_GENERATE_METADATA)),true,false))		$(call soong_config_set_bool,ANDROID,PRODUCT_FSVERITY_GENERATE_METADATA,$(if $(filter true,$(PRODUCT_FSVERITY_GENERATE_METADATA)),true,false))

	$(call add_soong_config_var,ANDROID,ADDITIONAL_M4DEFS,$(if $(BOARD_SEPOLICY_M4DEFS),$(addprefix -D,$(BOARD_SEPOLICY_M4DEFS))))		$(call add_soong_config_var,ANDROID,ADDITIONAL_M4DEFS,$(if $(BOARD_SEPOLICY_M4DEFS),$(addprefix -D,$(BOARD_SEPOLICY_M4DEFS))))
			$(call add_soong_config_var,ANDROID,TARGET_ADD_ROOT_EXTRA_VENDOR_SYMLINKS)

	# For BUILDING_GSI		# For BUILDING_GSI
	$(call soong_config_set_bool,gsi,building_gsi,$(if $(filter true,$(BUILDING_GSI)),true,false))		$(call soong_config_set_bool,gsi,building_gsi,$(if $(filter true,$(BUILDING_GSI)),true,false))

target/board/generic_arm64/BoardConfig.mk

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -66,6 +66,8 @@ include build/make/target/board/BoardConfigGsiCommon.mk
	BOARD_ROOT_EXTRA_SYMLINKS += /vendor/lib/dsp:/dsp		BOARD_ROOT_EXTRA_SYMLINKS += /vendor/lib/dsp:/dsp
	BOARD_ROOT_EXTRA_SYMLINKS += /mnt/vendor/persist:/persist		BOARD_ROOT_EXTRA_SYMLINKS += /mnt/vendor/persist:/persist
	BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt:/firmware		BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt:/firmware
			# for Android.bp
			TARGET_ADD_ROOT_EXTRA_VENDOR_SYMLINKS := true

	# TODO(b/36764215): remove this setting when the generic system image		# TODO(b/36764215): remove this setting when the generic system image
	# no longer has QCOM-specific directories under /.		# no longer has QCOM-specific directories under /.

target/product/aosp_arm.mk

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -67,3 +67,6 @@ PRODUCT_NAME := aosp_arm
	PRODUCT_DEVICE := generic		PRODUCT_DEVICE := generic
	PRODUCT_BRAND := Android		PRODUCT_BRAND := Android
	PRODUCT_MODEL := AOSP on ARM32		PRODUCT_MODEL := AOSP on ARM32

			PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE := aosp_system_image
			USE_SOONG_DEFINED_SYSTEM_IMAGE := true

target/product/aosp_arm64.mk

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -75,3 +75,6 @@ PRODUCT_BRAND := Android
	PRODUCT_MODEL := AOSP on ARM64		PRODUCT_MODEL := AOSP on ARM64

	PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true		PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true

			PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE := aosp_system_image
			USE_SOONG_DEFINED_SYSTEM_IMAGE := true

target/product/aosp_x86.mk

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -65,3 +65,6 @@ PRODUCT_NAME := aosp_x86
	PRODUCT_DEVICE := generic_x86		PRODUCT_DEVICE := generic_x86
	PRODUCT_BRAND := Android		PRODUCT_BRAND := Android
	PRODUCT_MODEL := AOSP on x86		PRODUCT_MODEL := AOSP on x86

			PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE := aosp_system_image
			USE_SOONG_DEFINED_SYSTEM_IMAGE := true