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

Commit ffdbab3f authored by Colin Cross's avatar Colin Cross
Browse files

Revert "Add VNDK v28 to GSI from Android Q" 

This reverts commit 6c4578b6.

Reason for revert: breaks unbundled app builds that don't have prebuilts/vndk

Bug: 113560265
Change-Id: I7c067fda1a369c67866eb8f327eb61170bb26533
parent 6c4578b6

target/product/aosp_arm.mk

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

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

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

+0 −3
Original line number Diff line number Diff line
@@ -54,9 +54,6 @@ 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 and P vendor interface

PRODUCT_EXTRA_VNDK_VERSIONS := 27 28
 
# Support addtional O-MR1 vendor interface

PRODUCT_EXTRA_VNDK_VERSIONS := 27