Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c4578b6 authored by SzuWei Lin's avatar SzuWei Lin
Browse files

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
parent 5fd10221

target/product/aosp_arm.mk

+3 −0
Original line number Diff line number Diff line
@@ -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

target/product/aosp_arm64.mk

+3 −0
Original line number Diff line number Diff line
@@ -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

target/product/aosp_x86.mk

+3 −0
Original line number Diff line number Diff line
@@ -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

target/product/aosp_x86_64.mk

+3 −0
Original line number Diff line number Diff line
@@ -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

target/product/treble_common.mk

+2 −2
Original line number Diff line number Diff line
@@ -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