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

Commit dc6533bb authored by Nelson Li's avatar Nelson Li
Browse files

Fix the values of soong_config_variable 

Correct the values of the Soong config variables
`TARGET_SUPPORTS_32_BIT_APPS`, `TARGET_SUPPORTS_64_BIT_APPS`, and
`building_gsi`.

`TARGET_SUPPORTS_32_BIT_APPS` and `TARGET_SUPPORTS_64_BIT_APPS` should
only be set to `true` or `false` after checking their values.

`building_gsi` should be set with a `default value` to prevent it from
always being empty due to never being explicitly set.

Bug: 3446751
Test: m -j TrichromeLibrary-Stub
Change-Id: Idf3bf1a47d7ae40880137e36ac1f0aa4b1b6dcc7
parent 5ae386cd

core/android_soong_config_vars.mk

+5 −2
Original line number Diff line number Diff line
@@ -39,12 +39,15 @@ $(call soong_config_set_bool,ANDROID,RELEASE_BOARD_API_LEVEL_FROZEN,$(RELEASE_BO 
$(call add_soong_config_var,ANDROID,TARGET_DYNAMIC_64_32_DRMSERVER)

$(call add_soong_config_var,ANDROID,TARGET_ENABLE_MEDIADRM_64)

$(call add_soong_config_var,ANDROID,TARGET_DYNAMIC_64_32_MEDIASERVER)

$(call soong_config_set_bool,ANDROID,TARGET_SUPPORTS_32_BIT_APPS,$(if $(TARGET_SUPPORTS_32_BIT_APPS),true,false))

$(call soong_config_set_bool,ANDROID,TARGET_SUPPORTS_64_BIT_APPS,$(if $(TARGET_SUPPORTS_64_BIT_APPS),true,false))

$(call soong_config_set_bool,ANDROID,TARGET_SUPPORTS_32_BIT_APPS,$(if $(filter true,$(TARGET_SUPPORTS_32_BIT_APPS)),true,false))

$(call soong_config_set_bool,ANDROID,TARGET_SUPPORTS_64_BIT_APPS,$(if $(filter true,$(TARGET_SUPPORTS_64_BIT_APPS)),true,false))

$(call add_soong_config_var,ANDROID,BOARD_GENFS_LABELS_VERSION)



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



# For BUILDING_GSI

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



# For bootable/recovery

RECOVERY_API_VERSION := 3

RECOVERY_FSTAB_VERSION := 2

target/product/gsi_release.mk

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#



BUILDING_GSI := true

$(call soong_config_set_bool,gsi,building_gsi,true)



PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \

    system/etc/init/config \