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

Commit fe2b206f authored Feb 10, 2025 by Inseob Kim Committed by Gerrit Code Review Feb 10, 2025

Revert^2 "Add soong module only for aosp_{arch}"

This reverts commit c125acc4.

Reason for revert: build breakage fixed with aosp/3486213

Change-Id: Iad7ee9ab188b2b387ec07d34cd6245aeb568ae4f

parent c125acc4

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

+5 −1

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

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

			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_NAME := aosp_arm
	PRODUCT_DEVICE := generic		PRODUCT_DEVICE := generic

target/product/aosp_arm64.mk

+5 −1

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

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

			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_NAME := aosp_arm64
	PRODUCT_DEVICE := generic_arm64		PRODUCT_DEVICE := generic_arm64

target/product/aosp_x86.mk

+5 −1

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

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

			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_NAME := aosp_x86
	PRODUCT_DEVICE := generic_x86		PRODUCT_DEVICE := generic_x86