summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2017-02-12 20:02:59 +0100
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2017-02-12 20:02:59 +0100
commitb11255af1d8ec38f0f04adcc8a6297e40282169c (patch)
treebb658d6fc2dc4868ff62b643ddb43d4d2c66d80e /core
parent530288f5a725848bb899636665ea3f14f9398fad (diff)
downloadbuild-b11255af1d8ec38f0f04adcc8a6297e40282169c.zip
build-b11255af1d8ec38f0f04adcc8a6297e40282169c.tar.gz
build-b11255af1d8ec38f0f04adcc8a6297e40282169c.tar.bz2
Fix libs list for manifest merger
Newer manifest merger expects colons instead of spaces. Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
Diffstat (limited to 'core')
-rw-r--r--core/android_manifest.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/android_manifest.mk b/core/android_manifest.mk
index 582bad4..9b2de03 100644
--- a/core/android_manifest.mk
+++ b/core/android_manifest.mk
@@ -21,6 +21,10 @@ my_full_libs_manifest_deps += $(foreach lib, $(LOCAL_STATIC_JAVA_AAR_LIBRARIES),
$(call intermediates-dir-for,JAVA_LIBRARIES,$(lib),,COMMON)/aar/classes.jar)
my_full_libs_manifest_files += $(foreach lib, $(LOCAL_STATIC_JAVA_AAR_LIBRARIES),\
$(call intermediates-dir-for,JAVA_LIBRARIES,$(lib),,COMMON)/aar/AndroidManifest.xml)
+spaces :=
+spaces +=
+spaces +=
+my_full_libs_manifest_files := $(subst $(spaces),:,$(my_full_libs_manifest_files))
LOCAL_RESOURCE_DIR += $(foreach lib, $(LOCAL_STATIC_JAVA_AAR_LIBRARIES),\
$(call intermediates-dir-for,JAVA_LIBRARIES,$(lib),,COMMON)/aar/res)