From b11255af1d8ec38f0f04adcc8a6297e40282169c Mon Sep 17 00:00:00 2001 From: Wolfgang Wiedmeyer Date: Sun, 12 Feb 2017 20:02:59 +0100 Subject: Fix libs list for manifest merger Newer manifest merger expects colons instead of spaces. Signed-off-by: Wolfgang Wiedmeyer --- core/android_manifest.mk | 4 ++++ 1 file changed, 4 insertions(+) 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) -- cgit v1.1