commit 3b274be6ca448a5de5d7b60f42001ec04acb5cf9
author Tobias Thierer <tobiast@google.com> Fri Jul 21 09:58:06 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jul 21 09:58:06 2017 +0000
tree 8d432a7f32ca33a8671a141f37e5c75773f7d039
parent cdbc4192619c83a5fc245a6ff72ac2cb8cf57b2c
parent 9dab617140cf94c1a88a1b55549f0e1f32fdf37e

Merge "droiddoc: Fix trailing ':' in -classpath, -sourcepath values" am: 40594041f4 am: cdcb785c3d am: f485958696 am: 3ca6866bb3
am: 9dab617140

Change-Id: I2c7163e4f621f6146817084f29d3777139cf33c6

core/droiddoc.mk

diff --git a/core/droiddoc.mk b/core/droiddoc.mk
index 94e282d..2676b44 100644
--- a/core/droiddoc.mk
+++ b/core/droiddoc.mk
@@ -86,8 +86,7 @@
 full_java_lib_deps := $(call java-lib-deps,$(LOCAL_JAVA_LIBRARIES)) $(LOCAL_CLASSPATH)
 endif # !LOCAL_IS_HOST_MODULE
 
-$(full_target): PRIVATE_CLASSPATH := $(subst $(space),:,$(full_java_libs))
-
+$(full_target): PRIVATE_CLASSPATH := $(call normalize-path-list,$(full_java_libs))
 
 intermediates.COMMON := $(call local-intermediates-dir,COMMON)