Merge "16k: build: Enable TARGET_NO_BIONIC_PAGE_SIZE_MACRO by default on Android V targets" into main
This commit is contained in:
commit
185a3fc892
7 changed files with 16 additions and 1 deletions
|
@ -420,9 +420,12 @@ endif
|
||||||
.KATI_READONLY := TARGET_MAX_PAGE_SIZE_SUPPORTED
|
.KATI_READONLY := TARGET_MAX_PAGE_SIZE_SUPPORTED
|
||||||
|
|
||||||
# Boolean variable determining if AOSP relies on bionic's PAGE_SIZE macro.
|
# 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
|
ifdef PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO
|
||||||
TARGET_NO_BIONIC_PAGE_SIZE_MACRO := $(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
|
endif
|
||||||
.KATI_READONLY := TARGET_NO_BIONIC_PAGE_SIZE_MACRO
|
.KATI_READONLY := TARGET_NO_BIONIC_PAGE_SIZE_MACRO
|
||||||
|
|
||||||
|
|
|
@ -72,3 +72,5 @@ PRODUCT_NAME := aosp_arm64
|
||||||
PRODUCT_DEVICE := generic_arm64
|
PRODUCT_DEVICE := generic_arm64
|
||||||
PRODUCT_BRAND := Android
|
PRODUCT_BRAND := Android
|
||||||
PRODUCT_MODEL := AOSP on ARM64
|
PRODUCT_MODEL := AOSP on ARM64
|
||||||
|
|
||||||
|
PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true
|
||||||
|
|
|
@ -74,3 +74,5 @@ PRODUCT_NAME := aosp_x86_64
|
||||||
PRODUCT_DEVICE := generic_x86_64
|
PRODUCT_DEVICE := generic_x86_64
|
||||||
PRODUCT_BRAND := Android
|
PRODUCT_BRAND := Android
|
||||||
PRODUCT_MODEL := AOSP on x86_64
|
PRODUCT_MODEL := AOSP on x86_64
|
||||||
|
|
||||||
|
PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true
|
||||||
|
|
|
@ -19,3 +19,5 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
|
||||||
|
|
||||||
PRODUCT_NAME := module_arm64
|
PRODUCT_NAME := module_arm64
|
||||||
PRODUCT_DEVICE := module_arm64
|
PRODUCT_DEVICE := module_arm64
|
||||||
|
|
||||||
|
PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true
|
||||||
|
|
|
@ -19,3 +19,5 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)
|
||||||
|
|
||||||
PRODUCT_NAME := module_arm64only
|
PRODUCT_NAME := module_arm64only
|
||||||
PRODUCT_DEVICE := module_arm64only
|
PRODUCT_DEVICE := module_arm64only
|
||||||
|
|
||||||
|
PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true
|
||||||
|
|
|
@ -19,3 +19,5 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
|
||||||
|
|
||||||
PRODUCT_NAME := module_x86_64
|
PRODUCT_NAME := module_x86_64
|
||||||
PRODUCT_DEVICE := module_x86_64
|
PRODUCT_DEVICE := module_x86_64
|
||||||
|
|
||||||
|
PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true
|
||||||
|
|
|
@ -19,3 +19,5 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)
|
||||||
|
|
||||||
PRODUCT_NAME := module_x86_64only
|
PRODUCT_NAME := module_x86_64only
|
||||||
PRODUCT_DEVICE := module_x86_64only
|
PRODUCT_DEVICE := module_x86_64only
|
||||||
|
|
||||||
|
PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true
|
||||||
|
|
Loading…
Reference in a new issue