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

16k: build: Enable TARGET_NO_BIONIC_PAGE_SIZE_MACRO by default on Android V targets

Browse source 
This relands commit 35839ec1a3 and also
includes `PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO` override for several
targets. The latter is required in order to fix failing tests due to
mismatch in the `VSR_VENDOR_API_LEVEL` value between test and device
targets.

Bug: 333124272
Bug: 310232825
Change-Id: I12db4b78b02aa4a58c7355852dc2ff5ae395592c
This commit is contained in:
Vilas Bhat 2024-04-15 17:32:27 +00:00
parent 8f9ca8075f
commit f44951d3af
7 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/config.mk
View file

@ -420,9 +420,12 @@ endif
.KATI_READONLY := TARGET_MAX_PAGE_SIZE_SUPPORTED
# Boolean variable determining if AOSP relies on bionic's PAGE_SIZE macro.
TARGET_NO_BIONIC_PAGE_SIZE_MACRO := false
ifdef PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO
TARGET_NO_BIONIC_PAGE_SIZE_MACRO := $(PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO)
else ifeq ($(call math_lt,$(VSR_VENDOR_API_LEVEL),35),true)
TARGET_NO_BIONIC_PAGE_SIZE_MACRO := false
else
TARGET_NO_BIONIC_PAGE_SIZE_MACRO := true
endif
.KATI_READONLY := TARGET_NO_BIONIC_PAGE_SIZE_MACRO

2
target/product/aosp_arm64.mk
View file

@ -72,3 +72,5 @@ PRODUCT_NAME := aosp_arm64
PRODUCT_DEVICE := generic_arm64
PRODUCT_BRAND := Android
PRODUCT_MODEL := AOSP on ARM64
PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true

2
target/product/aosp_x86_64.mk
View file

@ -74,3 +74,5 @@ PRODUCT_NAME := aosp_x86_64
PRODUCT_DEVICE := generic_x86_64
PRODUCT_BRAND := Android
PRODUCT_MODEL := AOSP on x86_64
PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true

2
target/product/module_arm64.mk
View file

@ -19,3 +19,5 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
PRODUCT_NAME := module_arm64
PRODUCT_DEVICE := module_arm64
PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true

2
target/product/module_arm64only.mk
View file

@ -19,3 +19,5 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)
PRODUCT_NAME := module_arm64only
PRODUCT_DEVICE := module_arm64only
PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true

2
target/product/module_x86_64.mk
View file

@ -19,3 +19,5 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
PRODUCT_NAME := module_x86_64
PRODUCT_DEVICE := module_x86_64
PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true

2
target/product/module_x86_64only.mk
View file

@ -19,3 +19,5 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)
PRODUCT_NAME := module_x86_64only
PRODUCT_DEVICE := module_x86_64only
PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true