commit 924d2d929d938cfc79b787cc1e217c714becbe0b
author Hung-ying Tyan <tyanh@google.com> Wed Sep 19 16:52:58 2018 +0800
committer Hung-ying Tyan <tyanh@google.com> Wed Sep 19 18:00:19 2018 +0800
tree 052652ffbd7227f45a5603e15dd6f759be79288f
parent 5f8eb7c553bbee5cc5ceea30bf189164f5244146

Condition VNDK check on TARGET_BUILD_APPS

Bug: 113560265
Test: (with the topic)
Test: mv prebuilts/vndk/v28 v28
Test: make TARGET_PRODUCT=aosp_arm TARGET_BUILD_APPS=Launcher3 TARGET_BUILD_VARIANT=userdebug
      --> build pass
Test: lunch aosp_arm-userdebug
      --> error: VNDK version 28 not found
Test: mv v28 prebuilts/vndk/v28
Test: lunch aosp_arm-userdebug
      --> no error
Change-Id: Ifb553a5ee4cec8b3f3b79aebdf824d64571fa817

core/envsetup.mk

diff --git a/core/envsetup.mk b/core/envsetup.mk
index 8ffbc19..66d7c1b 100644
--- a/core/envsetup.mk
+++ b/core/envsetup.mk
@@ -446,9 +446,11 @@
   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))