From 353d8ad0ac0df33cb1b58860d99720310de2135e Mon Sep 17 00:00:00 2001 From: RITEFANG <1721985272@qq.com> Date: Fri, 4 Oct 2024 13:46:09 +0800 Subject: [PATCH] Drop dumplcate device configs Signed-off-by: RITEFANG <1721985272@qq.com> --- core/soong_config.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/soong_config.mk b/core/soong_config.mk index c964bc3adb..1e6388a5ba 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk @@ -62,7 +62,7 @@ $(call add_json_bool, Debuggable, $(filter userdebug eng, $(call add_json_bool, Eng, $(filter eng,$(TARGET_BUILD_VARIANT))) $(call add_json_str, BuildType, $(TARGET_BUILD_TYPE)) -$(call add_json_str, MinusDeviceName, $(TARGET_DEVICE)) +$(call add_json_str, DeviceName, $(TARGET_DEVICE)) $(call add_json_str, DeviceProduct, $(TARGET_PRODUCT)) $(call add_json_str, DeviceArch, $(TARGET_ARCH)) $(call add_json_str, DeviceArchVariant, $(TARGET_ARCH_VARIANT)) @@ -149,7 +149,6 @@ $(call add_json_list, NativeCoverageExcludePaths, $(NATIVE_COVERAGE_EXCLU $(call add_json_bool, ArtUseReadBarrier, $(call invert_bool,$(filter false,$(PRODUCT_ART_USE_READ_BARRIER)))) $(call add_json_str, BtConfigIncludeDir, $(BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR)) $(call add_json_list, DeviceKernelHeaders, $(TARGET_DEVICE_KERNEL_HEADERS) $(TARGET_BOARD_KERNEL_HEADERS) $(TARGET_PRODUCT_KERNEL_HEADERS)) -$(call add_json_str, TargetSpecificHeaderPath, $(TARGET_SPECIFIC_HEADER_PATH)) $(call add_json_str, VendorApiLevel, $(BOARD_API_LEVEL)) $(call add_json_list, ExtraVndkVersions, $(PRODUCT_EXTRA_VNDK_VERSIONS)) $(call add_json_list, DeviceSystemSdkVersions, $(BOARD_SYSTEMSDK_VERSIONS)) @@ -367,7 +366,6 @@ $(call add_json_list, DeviceFrameworkCompatibilityMatrixFile, $(DEVICE_FRAMEWORK $(call add_json_list, DeviceProductCompatibilityMatrixFile, $(DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE)) $(call add_json_list, BoardAvbSystemAddHashtreeFooterArgs, $(BOARD_AVB_SYSTEM_ADD_HASHTREE_FOOTER_ARGS)) $(call add_json_bool, BoardAvbEnable, $(filter true,$(BOARD_AVB_ENABLE))) -$(call add_json_list, MinusDevice, $(TARGET_DEVICE)) $(call json_end)