p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge changes from topic "vndk28" 

am: 5bc52ac49f

Change-Id: I4b1acde427a78f9c49a6d9e5bb2ad6af245de9da
This commit is contained in:
Hung-ying Tyan 2018-09-20 22:36:57 -07:00 committed by android-build-merger
parent ea0c204d4f 5bc52ac49f
commit 48d9f62e6c
6 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/envsetup.mk
View File

@ -446,9 +446,11 @@ else
TARGET_VENDOR_TEST_SUFFIX := TARGET_VENDOR_TEST_SUFFIX :=
endif endif
ifeq (,$(TARGET_BUILD_APPS))
ifdef PRODUCT_EXTRA_VNDK_VERSIONS ifdef PRODUCT_EXTRA_VNDK_VERSIONS
$(foreach v,$(PRODUCT_EXTRA_VNDK_VERSIONS),$(call check_vndk_version,$(v))) $(foreach v,$(PRODUCT_EXTRA_VNDK_VERSIONS),$(call check_vndk_version,$(v)))
endif endif
endif
# Ensure that BOARD_SYSTEMSDK_VERSIONS are all within PLATFORM_SYSTEMSDK_VERSIONS # Ensure that BOARD_SYSTEMSDK_VERSIONS are all within PLATFORM_SYSTEMSDK_VERSIONS
_unsupported_systemsdk_versions := $(filter-out $(PLATFORM_SYSTEMSDK_VERSIONS),$(BOARD_SYSTEMSDK_VERSIONS)) _unsupported_systemsdk_versions := $(filter-out $(PLATFORM_SYSTEMSDK_VERSIONS),$(BOARD_SYSTEMSDK_VERSIONS))

3
target/product/aosp_arm.mk
View File

@ -38,4 +38,7 @@ PRODUCT_PACKAGES += \
# Needed by Pi newly launched device to pass VtsTrebleSysProp on GSI # Needed by Pi newly launched device to pass VtsTrebleSysProp on GSI
PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := true PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := true
# Support addtional P vendor interface
PRODUCT_EXTRA_VNDK_VERSIONS := 28
PRODUCT_NAME := aosp_arm PRODUCT_NAME := aosp_arm

3
target/product/aosp_arm64.mk
View File

@ -54,6 +54,9 @@ PRODUCT_PACKAGES += \
# Needed by Pi newly launched device to pass VtsTrebleSysProp on GSI # Needed by Pi newly launched device to pass VtsTrebleSysProp on GSI
PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := true PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := true
# Support addtional P vendor interface
PRODUCT_EXTRA_VNDK_VERSIONS := 28
PRODUCT_NAME := aosp_arm64 PRODUCT_NAME := aosp_arm64
PRODUCT_DEVICE := generic_arm64 PRODUCT_DEVICE := generic_arm64
PRODUCT_BRAND := Android PRODUCT_BRAND := Android

3
target/product/aosp_x86.mk
View File

@ -38,4 +38,7 @@ PRODUCT_PACKAGES += \
# Needed by Pi newly launched device to pass VtsTrebleSysProp on GSI # Needed by Pi newly launched device to pass VtsTrebleSysProp on GSI
PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := true PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := true
# Support addtional P vendor interface
PRODUCT_EXTRA_VNDK_VERSIONS := 28
PRODUCT_NAME := aosp_x86 PRODUCT_NAME := aosp_x86

3
target/product/aosp_x86_64.mk
View File

@ -54,6 +54,9 @@ PRODUCT_PACKAGES += \
# Needed by Pi newly launched device to pass VtsTrebleSysProp on GSI # Needed by Pi newly launched device to pass VtsTrebleSysProp on GSI
PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := true PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := true
# Support addtional P vendor interface
PRODUCT_EXTRA_VNDK_VERSIONS := 28
ifdef NET_ETH0_STARTONBOOT ifdef NET_ETH0_STARTONBOOT
PRODUCT_PROPERTY_OVERRIDES += net.eth0.startonboot=1 PRODUCT_PROPERTY_OVERRIDES += net.eth0.startonboot=1
endif endif

4
target/product/treble_common.mk
View File

@ -54,5 +54,5 @@ PRODUCT_COPY_FILES += \
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
ld.config.vndk_lite.txt ld.config.vndk_lite.txt
# Support addtional O-MR1 vendor interface # Support addtional O-MR1 and P vendor interface
PRODUCT_EXTRA_VNDK_VERSIONS := 27 PRODUCT_EXTRA_VNDK_VERSIONS := 27 28