commit 3dcd1c74acea186d84127e8110e5e10f78a2d14c
author Tao Bao <tbao@google.com> Fri Jul 21 17:20:59 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jul 21 17:20:59 2017 +0000
tree 09e15ac7ab8695400097dab54a430ebe4252fd28
parent 9dab617140cf94c1a88a1b55549f0e1f32fdf37e
parent 7a0a560c150f64bf6fa7c6d95a86ac93d6e6b2d5

Merge "Look for non-existent files listed in avb_vbmeta_args." into oc-dr1-dev am: 9c77abd6f2
am: 7a0a560c15

Change-Id: Ia460a492c39e0f1b41bc83c5d187da59180f71ac

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 330d360..d2bc611 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2227,7 +2227,7 @@
     $(addprefix -classpath ,$(strip \
         $(call normalize-path-list,$(PRIVATE_ALL_JAVA_LIBRARIES)))) \
     $(if $(findstring true,$(PRIVATE_WARNINGS_ENABLE)),$(xlint_unchecked),) \
-    -extdirs "" -d $(PRIVATE_CLASS_INTERMEDIATES_DIR) -s $(PRIVATE_ANNO_INTERMEDIATES_DIR) \
+    -d $(PRIVATE_CLASS_INTERMEDIATES_DIR) -s $(PRIVATE_ANNO_INTERMEDIATES_DIR) \
     $(PRIVATE_JAVACFLAGS) \
     \@$(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq \
     || ( rm -rf $(PRIVATE_CLASS_INTERMEDIATES_DIR) ; exit 41 ) \

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)