commit 392e2f8341df77b64616dbed174195b967e95911
author android-build-team Robot <android-build-team-robot@google.com> Mon Oct 09 19:10:41 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Mon Oct 09 19:10:41 2017 +0000
tree e10df82065185fe30472bfe02d8dd0518783b206
parent 38e99997361fcab2d3d507590169bcbebeb5887b
parent ee60ceffbf3f6bc73b8c49f0198862e7ed2db230

Snap for 4384531 from ee60ceffbf3f6bc73b8c49f0198862e7ed2db230 to oc-m2-release

Change-Id: I7c8ef56fdb15c96fac98f5ffa3527af257f6d182

current/Android.mk

diff --git a/current/Android.mk b/current/Android.mk
index a1e1f10..6729f72 100644
--- a/current/Android.mk
+++ b/current/Android.mk
@@ -21,7 +21,7 @@
 
 # For apps (unbundled) build, replace the typical
 # make target artifacts with prebuilts.
-ifneq ($(TARGET_BUILD_APPS),)
+ifneq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK)))
 include $(CLEAR_VARS)
 
 # Set up prebuilts for the core Support Library artifacts.
@@ -44,4 +44,4 @@
 # Generates the v4, v13, and appcompat libraries with static dependencies.
 include $(call all-makefiles-under,$(LOCAL_PATH))
 
-endif  # TARGET_BUILD_APPS not empty
+endif  # TARGET_BUILD_APPS not empty or TARGET_BUILD_PDK set to True