commit b279eee2dec977c26866a75d90ed6e43114e37a2
author Shinichiro Hamaji <hamaji@google.com> Thu Apr 21 05:56:08 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Apr 21 05:56:08 2016 +0000
tree 46ad900bacebcbf85635b3c92985343499cd2074
parent 6c29ca31763a7db9240a92577ebb1972625586c2
parent 99129ec4e3f44865cfa9957c3e9533dc77d8f494

Merge "Add normalize_path.py to prerequisites" am: 71211d8a0a
am: 99129ec4e3

* commit '99129ec4e3f44865cfa9957c3e9533dc77d8f494':
  Add normalize_path.py to prerequisites

Change-Id: I9c7e0d84e0b6ee36017180261af9a31c782058bf

core/host_dalvik_java_library.mk

diff --git a/core/host_dalvik_java_library.mk b/core/host_dalvik_java_library.mk
index 01ba42e..c2d2f2f 100644
--- a/core/host_dalvik_java_library.mk
+++ b/core/host_dalvik_java_library.mk
@@ -80,7 +80,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 7b9c25f..1a1de66 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -414,6 +414,7 @@
         $(layers_file) \
         $(RenderScript_file_stamp) \
         $(proto_java_sources_file_stamp) \
+        $(NORMALIZE_PATH) \
         $(LOCAL_ADDITIONAL_DEPENDENCIES)
 	$(transform-java-to-classes.jar)
 
@@ -629,7 +630,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) | setup-jack-server
 	@echo Checking build with Jack: $@