From 52fbc7df01551337602adf9e71da2c0df184d813 Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Fri, 21 Apr 2023 22:04:36 +0000 Subject: [PATCH] Remove config for 64-bit binder ABI Also make it an error to specify the configuration being removed. Bug: 232423610 Test: build, boot Change-Id: I1e4d993c7f4b9628eee6b270e47919aede4408b6 --- core/config.mk | 1 + core/soong_config.mk | 8 -------- target/board/BoardConfigMainlineCommon.mk | 3 --- target/board/BoardConfigModuleCommon.mk | 6 ------ target/board/mainline_sdk/BoardConfig.mk | 3 --- target/board/module_arm/BoardConfig.mk | 2 -- target/board/module_arm64/BoardConfig.mk | 2 -- target/board/module_arm64only/BoardConfig.mk | 2 -- target/board/module_x86/BoardConfig.mk | 2 -- target/board/module_x86_64/BoardConfig.mk | 2 -- target/board/module_x86_64only/BoardConfig.mk | 2 -- target/board/ndk/BoardConfig.mk | 1 - 12 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 target/board/BoardConfigModuleCommon.mk diff --git a/core/config.mk b/core/config.mk index 5b0256953f..1ecccb2582 100644 --- a/core/config.mk +++ b/core/config.mk @@ -42,6 +42,7 @@ endif # Mark variables deprecated/obsolete CHANGES_URL := https://android.googlesource.com/platform/build/+/master/Changes.md .KATI_READONLY := CHANGES_URL +$(KATI_deprecated_var TARGET_USES_64_BIT_BINDER,All devices use 64-bit binder by default now. Uses of TARGET_USES_64_BIT_BINDER should be removed.) $(KATI_obsolete_var PATH,Do not use PATH directly. See $(CHANGES_URL)#PATH) $(KATI_obsolete_var PYTHONPATH,Do not use PYTHONPATH directly. See $(CHANGES_URL)#PYTHONPATH) $(KATI_obsolete_var OUT,Use OUT_DIR instead. See $(CHANGES_URL)#OUT) diff --git a/core/soong_config.mk b/core/soong_config.mk index 346edcf9ae..daccd363c8 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk @@ -2,13 +2,6 @@ SOONG_MAKEVARS_MK := $(SOONG_OUT_DIR)/make_vars-$(TARGET_PRODUCT).mk SOONG_VARIABLES := $(SOONG_OUT_DIR)/soong.variables SOONG_ANDROID_MK := $(SOONG_OUT_DIR)/Android-$(TARGET_PRODUCT).mk -BINDER32BIT := -ifneq ($(TARGET_USES_64_BIT_BINDER),true) -ifneq ($(TARGET_IS_64_BIT),true) -BINDER32BIT := true -endif -endif - include $(BUILD_SYSTEM)/art_config.mk include $(BUILD_SYSTEM)/dex_preopt_config.mk @@ -142,7 +135,6 @@ $(call add_json_list, NativeCoverageExcludePaths, $(NATIVE_COVERAGE_EXCLU $(call add_json_bool, SamplingPGO, $(filter true,$(SAMPLING_PGO))) $(call add_json_bool, ArtUseReadBarrier, $(call invert_bool,$(filter false,$(PRODUCT_ART_USE_READ_BARRIER)))) -$(call add_json_bool, Binder32bit, $(BINDER32BIT)) $(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, DeviceVndkVersion, $(BOARD_VNDK_VERSION)) diff --git a/target/board/BoardConfigMainlineCommon.mk b/target/board/BoardConfigMainlineCommon.mk index e5ac5cf546..01ebe56ba6 100644 --- a/target/board/BoardConfigMainlineCommon.mk +++ b/target/board/BoardConfigMainlineCommon.mk @@ -24,9 +24,6 @@ BOARD_USES_METADATA_PARTITION := true # Default is current, but allow devices to override vndk version if needed. BOARD_VNDK_VERSION ?= current -# Required flag for non-64 bit devices from P. -TARGET_USES_64_BIT_BINDER := true - # 64 bit mediadrmserver TARGET_ENABLE_MEDIADRM_64 := true diff --git a/target/board/BoardConfigModuleCommon.mk b/target/board/BoardConfigModuleCommon.mk deleted file mode 100644 index 24c01a58ef..0000000000 --- a/target/board/BoardConfigModuleCommon.mk +++ /dev/null @@ -1,6 +0,0 @@ -# BoardConfigModuleCommon.mk -# -# Common compile-time settings for module builds. - -# Required for all module devices. -TARGET_USES_64_BIT_BINDER := true diff --git a/target/board/mainline_sdk/BoardConfig.mk b/target/board/mainline_sdk/BoardConfig.mk index f5c2dc6b49..84f8b2dac6 100644 --- a/target/board/mainline_sdk/BoardConfig.mk +++ b/target/board/mainline_sdk/BoardConfig.mk @@ -18,6 +18,3 @@ TARGET_ARCH_SUITE := mainline_sdk HOST_CROSS_OS := linux_bionic HOST_CROSS_ARCH := x86_64 HOST_CROSS_2ND_ARCH := - -# Required flag for non-64 bit devices from P. -TARGET_USES_64_BIT_BINDER := true diff --git a/target/board/module_arm/BoardConfig.mk b/target/board/module_arm/BoardConfig.mk index 3f35c060e1..565efc8425 100644 --- a/target/board/module_arm/BoardConfig.mk +++ b/target/board/module_arm/BoardConfig.mk @@ -13,8 +13,6 @@ # limitations under the License. # -include build/make/target/board/BoardConfigModuleCommon.mk - TARGET_ARCH := arm TARGET_ARCH_VARIANT := armv7-a-neon TARGET_CPU_VARIANT := generic diff --git a/target/board/module_arm64/BoardConfig.mk b/target/board/module_arm64/BoardConfig.mk index 3700056da3..66e3792640 100644 --- a/target/board/module_arm64/BoardConfig.mk +++ b/target/board/module_arm64/BoardConfig.mk @@ -13,8 +13,6 @@ # limitations under the License. # -include build/make/target/board/BoardConfigModuleCommon.mk - TARGET_ARCH := arm64 TARGET_ARCH_VARIANT := armv8-a TARGET_CPU_VARIANT := generic diff --git a/target/board/module_arm64only/BoardConfig.mk b/target/board/module_arm64only/BoardConfig.mk index 3cabf05d94..6c265799e7 100644 --- a/target/board/module_arm64only/BoardConfig.mk +++ b/target/board/module_arm64only/BoardConfig.mk @@ -13,8 +13,6 @@ # limitations under the License. # -include build/make/target/board/BoardConfigModuleCommon.mk - TARGET_ARCH := arm64 TARGET_ARCH_VARIANT := armv8-a TARGET_CPU_VARIANT := generic diff --git a/target/board/module_x86/BoardConfig.mk b/target/board/module_x86/BoardConfig.mk index a93ac9779c..af3fffd067 100644 --- a/target/board/module_x86/BoardConfig.mk +++ b/target/board/module_x86/BoardConfig.mk @@ -13,8 +13,6 @@ # limitations under the License. # -include build/make/target/board/BoardConfigModuleCommon.mk - TARGET_CPU_ABI := x86 TARGET_ARCH := x86 TARGET_ARCH_VARIANT := x86 diff --git a/target/board/module_x86_64/BoardConfig.mk b/target/board/module_x86_64/BoardConfig.mk index 1ed3be0ba6..1ada02729e 100644 --- a/target/board/module_x86_64/BoardConfig.mk +++ b/target/board/module_x86_64/BoardConfig.mk @@ -13,8 +13,6 @@ # limitations under the License. # -include build/make/target/board/BoardConfigModuleCommon.mk - TARGET_CPU_ABI := x86_64 TARGET_ARCH := x86_64 TARGET_ARCH_VARIANT := x86_64 diff --git a/target/board/module_x86_64only/BoardConfig.mk b/target/board/module_x86_64only/BoardConfig.mk index b0676cbe22..5b86f0a8a3 100644 --- a/target/board/module_x86_64only/BoardConfig.mk +++ b/target/board/module_x86_64only/BoardConfig.mk @@ -13,8 +13,6 @@ # limitations under the License. # -include build/make/target/board/BoardConfigModuleCommon.mk - TARGET_CPU_ABI := x86_64 TARGET_ARCH := x86_64 TARGET_ARCH_VARIANT := x86_64 diff --git a/target/board/ndk/BoardConfig.mk b/target/board/ndk/BoardConfig.mk index da8b5f3e74..b485f8b79e 100644 --- a/target/board/ndk/BoardConfig.mk +++ b/target/board/ndk/BoardConfig.mk @@ -14,7 +14,6 @@ # TARGET_ARCH_SUITE := ndk -TARGET_USES_64_BIT_BINDER := true MALLOC_SVELTE := true