Merge changes from topic "vndk28"

* changes:
  Condition VNDK check on TARGET_BUILD_APPS
  Revert "Revert "Add VNDK v28 to GSI from Android Q""
This commit is contained in:
Treehugger Robot
2018-09-20 06:21:43 +00:00
committed by Gerrit Code Review
6 changed files with 16 additions and 2 deletions

View File

@@ -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))