From 6c4578b64e02ee9e5524ac963c87fbcf838b73ef Mon Sep 17 00:00:00 2001 From: SzuWei Lin Date: Tue, 4 Sep 2018 18:03:33 +0800 Subject: [PATCH] Add VNDK v28 to GSI from Android Q From Android Q, Legacy GSI (aosp_$arch_a(b)-userdebug) can only support the devices which upgraded from O or O-MR1. The normal GSI (aosp_$arch-userdebug) will support the device which launch from P or Q. The patch add VNDK v28 to Legacy GSI and normal GSI. Bug: 113560265 Test: lunch aosp_arm64_ab-userdebug; make -j Check the folder $OUT/system/lib64/vndk-28 existing Change-Id: I941d2cd56264fffc3ded338871409594a430dce5 --- 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