commit 5b724965f416c0dbea634f1c7f4f402cbb9a63bb
author Treehugger Robot <treehugger-gerrit@google.com> Mon Jan 21 23:41:06 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 21 23:41:06 2019 +0000
tree 434ac10360e6772d5306a9d66fe24db0320a41da
parent 16518030ccf83765668a0dde45e9dc464ba3043a
parent 8fbd34780c7caad809be52ee0bc5cbd9b2d66391

Merge "Don't create prebuilt SDK modules when building them from source"

current/Android.mk

diff --git a/current/Android.mk b/current/Android.mk
index 8952578..ac2a52a 100644
--- a/current/Android.mk
+++ b/current/Android.mk
@@ -35,7 +35,7 @@
 
 # For apps (unbundled) build, replace the typical
 # make target artifacts with prebuilts.
-ifneq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK)))
+ifneq (,$(TARGET_BUILD_APPS_USE_PREBUILT_SDK)$(filter true,$(TARGET_BUILD_PDK)))
     # Set up prebuilts for Multidex library artifacts.
     multidex_jars := \
       $(patsubst $(LOCAL_PATH)/%,%,\