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

Commit 5bc52ac4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topic "vndk28" 

* changes:
  Condition VNDK check on TARGET_BUILD_APPS
  Revert "Revert "Add VNDK v28 to GSI from Android Q""
parents abda9446 924d2d92

core/envsetup.mk

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

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