commit d50001e74a380afe94c0892bf42a1c1cafb4409b
author Shinichiro Hamaji <hamaji@google.com> Tue Apr 19 16:17:55 2016 +0900
committer Shinichiro Hamaji <hamaji@google.com> Tue Apr 19 16:22:27 2016 +0900
tree 600d8b9b764912648af1181fdccc5dc5e0cf3f0b
parent 44a22a34f72936f7006ce50510c2d54d19b5d798

Add normalize_path.py to prerequisites

Bug: 27954979
Change-Id: I1e22eb4f42a8cb348ce1101e207e239bc5aa7976

core/host_dalvik_java_library.mk

diff --git a/core/host_dalvik_java_library.mk b/core/host_dalvik_java_library.mk
index e1d62cc..da03a13 100644
--- a/core/host_dalvik_java_library.mk
+++ b/core/host_dalvik_java_library.mk
@@ -81,7 +81,7 @@
 
 jack_all_deps := $(java_sources) $(java_resource_sources) $(full_jack_deps) \
         $(jar_manifest_file) $(proto_java_sources_file_stamp) \
-        $(LOCAL_ADDITIONAL_DEPENDENCIES) $(JACK_DEFAULT_ARGS) $(JACK)
+        $(LOCAL_ADDITIONAL_DEPENDENCIES) $(NORMALIZE_PATH) $(JACK_DEFAULT_ARGS) $(JACK)
 
 ifneq ($(LOCAL_IS_STATIC_JAVA_LIBRARY),true)
 $(built_dex): PRIVATE_CLASSES_JACK := $(full_classes_jack)

core/host_java_library.mk

diff --git a/core/host_java_library.mk b/core/host_java_library.mk
index 0d71c01..9aa2a7c 100644
--- a/core/host_java_library.mk
+++ b/core/host_java_library.mk
@@ -66,6 +66,7 @@
         $(full_java_lib_deps) \
         $(jar_manifest_file) \
         $(proto_java_sources_file_stamp) \
+        $(NORMALIZE_PATH) \
         $(LOCAL_ADDITIONAL_DEPENDENCIES)
 	$(transform-host-java-to-package)
 

core/java.mk

diff --git a/core/java.mk b/core/java.mk
index 6ee983e..58f4d97 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -406,6 +406,7 @@
         $(layers_file) \
         $(RenderScript_file_stamp) \
         $(proto_java_sources_file_stamp) \
+        $(NORMALIZE_PATH) \
         $(LOCAL_ADDITIONAL_DEPENDENCIES)
 	$(transform-java-to-classes.jar)
 
@@ -621,7 +622,7 @@
         $(jar_manifest_file) $(layers_file) $(RenderScript_file_stamp) \
         $(common_proguard_flag_files) $(proguard_flag_files) \
         $(proto_java_sources_file_stamp) $(LOCAL_ADDITIONAL_DEPENDENCIES) $(LOCAL_JARJAR_RULES) \
-        $(JACK_DEFAULT_ARGS) $(JACK)
+        $(NORMALIZE_PATH) $(JACK_DEFAULT_ARGS) $(JACK)
 
 $(jack_check_timestamp): $(jack_all_deps)
 	@echo Checking build with Jack: $@