commit 58b3ee286363ee37f8f0bb84f6acefaf96102fef
author Ying Wang <wangying@google.com> Wed May 27 22:32:41 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed May 27 22:32:41 2015 +0000
tree 75d46b17fcf3cb4b69f95ee3c775271ca88a2f7e
parent a6ffb929f44e8def03bdc820386c5acfbd78f24b
parent 12f449756587b83cd6a04c793e05b837ceb41563

am 12f44975: Strip LOCAL_STATIC_JAVA_AAR_LIBRARIES

* commit '12f449756587b83cd6a04c793e05b837ceb41563':
  Strip LOCAL_STATIC_JAVA_AAR_LIBRARIES

core/android_manifest.mk

diff --git a/core/android_manifest.mk b/core/android_manifest.mk
index c641b75..582bad4 100644
--- a/core/android_manifest.mk
+++ b/core/android_manifest.mk
@@ -15,6 +15,7 @@
 my_full_libs_manifest_deps := $(LOCAL_FULL_LIBS_MANIFEST_FILES)
 
 # Set up dependency on aar libraries
+LOCAL_STATIC_JAVA_AAR_LIBRARIES := $(strip $(LOCAL_STATIC_JAVA_AAR_LIBRARIES))
 ifdef LOCAL_STATIC_JAVA_AAR_LIBRARIES
 my_full_libs_manifest_deps += $(foreach lib, $(LOCAL_STATIC_JAVA_AAR_LIBRARIES),\
   $(call intermediates-dir-for,JAVA_LIBRARIES,$(lib),,COMMON)/aar/classes.jar)