From 5f8eb7c553bbee5cc5ceea30bf189164f5244146 Mon Sep 17 00:00:00 2001 From: Hung-ying Tyan Date: Wed, 19 Sep 2018 17:08:29 +0800 Subject: [PATCH] Revert "Revert "Add VNDK v28 to GSI from Android Q"" This reverts commit ffdbab3ff3d7108dbe644ef6d0faeb1bee3bfd50. Bug: 113560265 Test: (with the topic) build aosp_arm-userdebug and app only with and without vndk 28 Change-Id: I68a74ba5544a262414e777d8f07bc1ea18f24235 --- target/product/aosp_arm.mk | 3 +++ target/product/aosp_arm64.mk | 3 +++ target/product/aosp_x86.mk | 3 +++ target/product/aosp_x86_64.mk | 3 +++ target/product/treble_common.mk | 4 ++-- 5 files changed, 14 insertions(+), 2 deletions(-) diff --git a/target/product/aosp_arm.mk b/target/product/aosp_arm.mk index f0752a8e2..795f8aac6 100644 --- a/target/product/aosp_arm.mk +++ b/target/product/aosp_arm.mk @@ -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 diff --git a/target/product/aosp_arm64.mk b/target/product/aosp_arm64.mk index ab231110c..f3f3c5af4 100644 --- a/target/product/aosp_arm64.mk +++ b/target/product/aosp_arm64.mk @@ -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 diff --git a/target/product/aosp_x86.mk b/target/product/aosp_x86.mk index 9d1b14bc9..e3167af45 100644 --- a/target/product/aosp_x86.mk +++ b/target/product/aosp_x86.mk @@ -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 diff --git a/target/product/aosp_x86_64.mk b/target/product/aosp_x86_64.mk index b38c4173e..222adaab8 100644 --- a/target/product/aosp_x86_64.mk +++ b/target/product/aosp_x86_64.mk @@ -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 diff --git a/target/product/treble_common.mk b/target/product/treble_common.mk index 6b0ef2ffb..5c2a67857 100644 --- a/target/product/treble_common.mk +++ b/target/product/treble_common.mk @@ -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