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

Commit 52fbc7df authored by Steven Moreland's avatar Steven Moreland
Browse files

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
parent 03a11ff1

core/config.mk

+1 −0
Original line number Diff line number Diff line
@@ -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)

core/soong_config.mk

+0 −8
Original line number Diff line number Diff line
@@ -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))

target/board/BoardConfigMainlineCommon.mk

+0 −3
Original line number Diff line number Diff line
@@ -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

target/board/BoardConfigModuleCommon.mk

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
# BoardConfigModuleCommon.mk

#

# Common compile-time settings for module builds.



# Required for all module devices.

TARGET_USES_64_BIT_BINDER := true

target/board/mainline_sdk/BoardConfig.mk

+0 −3
Original line number Diff line number Diff line
@@ -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