openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge changes from topic "vndk28" 

* changes:
  Condition VNDK check on TARGET_BUILD_APPS
  Revert "Revert "Add VNDK v28 to GSI from Android Q""
This commit is contained in:
Treehugger Robot 2018-09-20 06:21:43 +00:00 committed by Gerrit Code Review
parent abda944667 924d2d929d
commit 5bc52ac49f
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 :=
endif
ifeq (,$(TARGET_BUILD_APPS))
ifdef PRODUCT_EXTRA_VNDK_VERSIONS
$(foreach v,$(PRODUCT_EXTRA_VNDK_VERSIONS),$(call check_vndk_version,$(v)))
endif
endif
# Ensure that BOARD_SYSTEMSDK_VERSIONS are all within PLATFORM_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
PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := true
# Support addtional P vendor interface
PRODUCT_EXTRA_VNDK_VERSIONS := 28
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
PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := true
# Support addtional P vendor interface
PRODUCT_EXTRA_VNDK_VERSIONS := 28
PRODUCT_NAME := aosp_arm64
PRODUCT_DEVICE := generic_arm64
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
PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := true
# Support addtional P vendor interface
PRODUCT_EXTRA_VNDK_VERSIONS := 28
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
PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := true
# Support addtional P vendor interface
PRODUCT_EXTRA_VNDK_VERSIONS := 28
ifdef NET_ETH0_STARTONBOOT
PRODUCT_PROPERTY_OVERRIDES += net.eth0.startonboot=1
endif

4
target/product/treble_common.mk
View File

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