tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Remove config for 64-bit binder ABI" am: 8844e4f145 am: 03ceb1b56e am: be7574828c

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2553826

Change-Id: Ia0c75f07b9ac519460a05ae00b2de9a73f8abc6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-05-02 00:09:38 +00:00 committed by Automerger Merge Worker
commit b981ba578c
12 changed files with 1 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/config.mk
View file

@ -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)

8
core/soong_config.mk
View file

@ -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
@ -143,7 +136,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))

3
target/board/BoardConfigMainlineCommon.mk
View file

@ -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

6
target/board/BoardConfigModuleCommon.mk
View file

@ -1,6 +0,0 @@
# BoardConfigModuleCommon.mk
#
# Common compile-time settings for module builds.
# Required for all module devices.
TARGET_USES_64_BIT_BINDER := true

3
target/board/mainline_sdk/BoardConfig.mk
View file

@ -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

2
target/board/module_arm/BoardConfig.mk
View file

@ -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

2
target/board/module_arm64/BoardConfig.mk
View file

@ -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

2
target/board/module_arm64only/BoardConfig.mk
View file

@ -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

2
target/board/module_x86/BoardConfig.mk
View file

@ -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

2
target/board/module_x86_64/BoardConfig.mk
View file

@ -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

2
target/board/module_x86_64only/BoardConfig.mk
View file

@ -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

1
target/board/ndk/BoardConfig.mk
View file

@ -14,7 +14,6 @@
#
TARGET_ARCH_SUITE := ndk
TARGET_USES_64_BIT_BINDER := true
MALLOC_SVELTE := true