summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2017-02-12 19:02:59 (GMT)
committerDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2020-01-02 17:17:55 (GMT)
commit5b64de7bd4d9f8e40612e4278d16d3240fd9c1ac (patch)
treebb29895fd4d7dd6f09f0fb73051c4fffc2b0bd36
parentcba2737caeb5a72a36717c2f5813b19a1d4b1a01 (diff)
downloadbuild-5b64de7bd4d9f8e40612e4278d16d3240fd9c1ac.zip
build-5b64de7bd4d9f8e40612e4278d16d3240fd9c1ac.tar.gz
build-5b64de7bd4d9f8e40612e4278d16d3240fd9c1ac.tar.bz2
Fix libs list for manifest merger
Newer manifest merger expects colons instead of spaces. Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
-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)