openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Add normalize_path.py to prerequisites" 

am: 71211d8a0a

* commit '71211d8a0a32985b9a4fb21caaad300560ed1211':
  Add normalize_path.py to prerequisites

Change-Id: I166372c788d567bf78804f091eb9fa5515be8401
This commit is contained in:
Shinichiro Hamaji 2016-04-21 05:54:00 +00:00 committed by android-build-merger
parent d4e3bb8acd 71211d8a0a
commit 99129ec4e3
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/host_dalvik_java_library.mk
View File

@ -81,7 +81,7 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_MIN_SDK_VERSION := $(PLATFORM_JACK_M
jack_all_deps := $(java_sources) $(java_resource_sources) $(full_jack_deps) \ jack_all_deps := $(java_sources) $(java_resource_sources) $(full_jack_deps) \
$(jar_manifest_file) $(proto_java_sources_file_stamp) \ $(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) ifneq ($(LOCAL_IS_STATIC_JAVA_LIBRARY),true)
$(built_dex): PRIVATE_CLASSES_JACK := $(full_classes_jack) $(built_dex): PRIVATE_CLASSES_JACK := $(full_classes_jack)

1
core/host_java_library.mk
View File

@ -66,6 +66,7 @@ $(full_classes_compiled_jar): \
$(full_java_lib_deps) \ $(full_java_lib_deps) \
$(jar_manifest_file) \ $(jar_manifest_file) \
$(proto_java_sources_file_stamp) \ $(proto_java_sources_file_stamp) \
$(NORMALIZE_PATH) \
$(LOCAL_ADDITIONAL_DEPENDENCIES) $(LOCAL_ADDITIONAL_DEPENDENCIES)
$(transform-host-java-to-package) $(transform-host-java-to-package)

3
core/java.mk
View File

@ -406,6 +406,7 @@ $(full_classes_compiled_jar): \
$(layers_file) \ $(layers_file) \
$(RenderScript_file_stamp) \ $(RenderScript_file_stamp) \
$(proto_java_sources_file_stamp) \ $(proto_java_sources_file_stamp) \
$(NORMALIZE_PATH) \
$(LOCAL_ADDITIONAL_DEPENDENCIES) $(LOCAL_ADDITIONAL_DEPENDENCIES)
$(transform-java-to-classes.jar) $(transform-java-to-classes.jar)
@ -621,7 +622,7 @@ jack_all_deps := $(java_sources) $(java_resource_sources) $(full_jack_deps) \
$(jar_manifest_file) $(layers_file) $(RenderScript_file_stamp) \ $(jar_manifest_file) $(layers_file) $(RenderScript_file_stamp) \
$(common_proguard_flag_files) $(proguard_flag_files) \ $(common_proguard_flag_files) $(proguard_flag_files) \
$(proto_java_sources_file_stamp) $(LOCAL_ADDITIONAL_DEPENDENCIES) $(LOCAL_JARJAR_RULES) \ $(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 $(jack_check_timestamp): $(jack_all_deps) | setup-jack-server
@echo Checking build with Jack: $@ @echo Checking build with Jack: $@