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

Commit ca276c95 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "revert-31643748-soong_built_gsi-BAVQDHZJEL" into main 

* changes:
  Revert^3 "Add soong module for aosp_{arch}"
  Revert "Use soong NOTICE.xml for aosp_{arch} targets"
parents 63fc72f1 1c329d0c

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

+0 −4
Original line number Diff line number Diff line
@@ -62,12 +62,8 @@ MODULE_BUILD_FROM_SOURCE ?= true 
$(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk)

endif



PRODUCT_USE_SOONG_NOTICE_XML := true



PRODUCT_NAME := aosp_arm

PRODUCT_DEVICE := generic

PRODUCT_BRAND := Android

PRODUCT_MODEL := AOSP on ARM32
 


PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE := aosp_system_image

USE_SOONG_DEFINED_SYSTEM_IMAGE := true

target/product/aosp_arm64.mk

+0 −4
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ MODULE_BUILD_FROM_SOURCE ?= true 
$(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk)

endif



PRODUCT_USE_SOONG_NOTICE_XML := true



PRODUCT_NAME := aosp_arm64

PRODUCT_DEVICE := generic_arm64
@@ -76,6 +75,3 @@ PRODUCT_BRAND := Android 
PRODUCT_MODEL := AOSP on ARM64



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

+0 −4
Original line number Diff line number Diff line
@@ -60,12 +60,8 @@ MODULE_BUILD_FROM_SOURCE ?= true 
$(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk)

endif



PRODUCT_USE_SOONG_NOTICE_XML := true



PRODUCT_NAME := aosp_x86

PRODUCT_DEVICE := generic_x86

PRODUCT_BRAND := Android

PRODUCT_MODEL := AOSP on x86
 


PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE := aosp_system_image

USE_SOONG_DEFINED_SYSTEM_IMAGE := true