commit 55e4816d0fa8b645e43f7ea0aee57ccc606545c5
author Jiyong Park <jiyong@google.com> Tue Dec 12 08:08:12 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Dec 12 08:08:12 2017 +0000
tree 5791abd726feb016134b4f5a972a95ed9838a6cf
parent 0738ddd4907554365fc2bef529d0782c0f7f0cc1
parent 703dd599be4e2697c560347f2dcc284c2d58b817

Merge "Use normalize-path-list"
am: c034cd5d04

Change-Id: I9d70f63c39a561b31c8061594a31ec449817ecc9

rootdir/Android.mk

diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index d1c0058..e9bd8d4 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -144,19 +144,19 @@
 LOCAL_MODULE_STEM := $(LOCAL_MODULE)
 include $(BUILD_SYSTEM)/base_rules.mk
 
-llndk_libraries := $(subst $(space),:,$(addsuffix .so,\
+llndk_libraries := $(call normalize-path-list,$(addsuffix .so,\
 $(filter-out $(VNDK_PRIVATE_LIBRARIES),$(LLNDK_LIBRARIES))))
 
-private_llndk_libraries := $(subst $(space),:,$(addsuffix .so,\
+private_llndk_libraries := $(call normalize-path-list,$(addsuffix .so,\
 $(filter $(VNDK_PRIVATE_LIBRARIES),$(LLNDK_LIBRARIES))))
 
-vndk_sameprocess_libraries := $(subst $(space),:,$(addsuffix .so,\
+vndk_sameprocess_libraries := $(call normalize-path-list,$(addsuffix .so,\
 $(filter-out $(VNDK_PRIVATE_LIBRARIES),$(VNDK_SAMEPROCESS_LIBRARIES))))
 
-vndk_core_libraries := $(subst $(space),:,$(addsuffix .so,\
+vndk_core_libraries := $(call normalize-path-list,$(addsuffix .so,\
 $(filter-out $(VNDK_PRIVATE_LIBRARIES),$(VNDK_CORE_LIBRARIES))))
 
-sanitizer_runtime_libraries := $(subst $(space),:,$(addsuffix .so,\
+sanitizer_runtime_libraries := $(call normalize-path-list,$(addsuffix .so,\
 $(ADDRESS_SANITIZER_RUNTIME_LIBRARY) \
 $(UBSAN_RUNTIME_LIBRARY) \
 $(TSAN_RUNTIME_LIBRARY) \