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

Commit a793031d authored Feb 10, 2025 by Inseob Kim Committed by Automerger Merge Worker Feb 10, 2025

Merge "Revert "Add soong module only for aosp_{arch}"" into main am: 0ff62f65 am: 1cc23973

Original change: https://android-review.googlesource.com/c/platform/build/+/3486212

Change-Id: I6ef52ea02033d1c827bec3cd607416f7d1a31075
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents ac9e4fd6 1cc23973

core/android_soong_config_vars.mk

+0 −1

Original line number	Diff line number	Diff line
		@@ -45,7 +45,6 @@ $(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 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
		$(call soong_config_set_bool,gsi,building_gsi,$(if $(filter true,$(BUILDING_GSI)),true,false))

target/board/generic_arm64/BoardConfig.mk

+0 −2

Original line number	Diff line number	Diff line
		@@ -66,8 +66,6 @@ include build/make/target/board/BoardConfigGsiCommon.mk
		BOARD_ROOT_EXTRA_SYMLINKS += /vendor/lib/dsp:/dsp
		BOARD_ROOT_EXTRA_SYMLINKS += /mnt/vendor/persist:/persist
		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
		# no longer has QCOM-specific directories under /.

target/product/aosp_arm.mk

+1 −5

Original line number	Diff line number	Diff line
		@@ -60,13 +60,9 @@ ifeq (aosp_arm,$(TARGET_PRODUCT))
		MODULE_BUILD_FROM_SOURCE ?= true

		$(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk)

		PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE := aosp_system_image
		USE_SOONG_DEFINED_SYSTEM_IMAGE := true
		PRODUCT_USE_SOONG_NOTICE_XML := true

		endif


		PRODUCT_NAME := aosp_arm
		PRODUCT_DEVICE := generic
		PRODUCT_BRAND := Android

target/product/aosp_arm64.mk

+1 −5

Original line number	Diff line number	Diff line
		@@ -66,13 +66,9 @@ ifeq (aosp_arm64,$(TARGET_PRODUCT))
		MODULE_BUILD_FROM_SOURCE ?= true

		$(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk)

		PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE := aosp_system_image
		USE_SOONG_DEFINED_SYSTEM_IMAGE := true
		PRODUCT_USE_SOONG_NOTICE_XML := true

		endif


		PRODUCT_NAME := aosp_arm64
		PRODUCT_DEVICE := generic_arm64
		PRODUCT_BRAND := Android

target/product/aosp_x86.mk

+1 −5

Original line number	Diff line number	Diff line
		@@ -58,13 +58,9 @@ ifeq (aosp_x86,$(TARGET_PRODUCT))
		MODULE_BUILD_FROM_SOURCE ?= true

		$(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk)

		PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE := aosp_system_image
		USE_SOONG_DEFINED_SYSTEM_IMAGE := true
		PRODUCT_USE_SOONG_NOTICE_XML := true

		endif


		PRODUCT_NAME := aosp_x86
		PRODUCT_DEVICE := generic_x86
		PRODUCT_BRAND := Android