Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71211d8a authored by Shinichiro Hamaji's avatar Shinichiro Hamaji Committed by Gerrit Code Review
Browse files

Merge "Add normalize_path.py to prerequisites"

parents c24740fd d50001e7

core/host_dalvik_java_library.mk

+1 −1
Original line number Diff line number Diff line
@@ -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) \

        $(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

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ $(full_classes_compiled_jar): \ 
        $(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

+2 −1
Original line number Diff line number Diff line
@@ -406,6 +406,7 @@ $(full_classes_compiled_jar): \ 
        $(layers_file) \

        $(RenderScript_file_stamp) \

        $(proto_java_sources_file_stamp) \

        $(NORMALIZE_PATH) \

        $(LOCAL_ADDITIONAL_DEPENDENCIES)

	$(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) \

        $(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: $@