p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Force make to check date of classes.jack after Jack run"

This commit is contained in:
Jean-Philippe Lesot 2015-02-13 01:09:09 +00:00 committed by Android (Google) Code Review
parent 1145b336f7 c6b44d43c3
commit 5c938ffb33
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/host_dalvik_java_library.mk
View File

@ -133,7 +133,11 @@ $(built_dex): $(java_sources) $(java_resource_sources) $(full_jack_lib_deps) \
@echo Building with Jack: $@
$(jack-java-to-dex)
# The empty command was added because, without it, make misses the fact the $(built_dex) also
# change $(full_classes_jack). Looks like it would test the date before running $(built_dex)
# command.
$(full_classes_jack): $(built_dex)
@echo
$(LOCAL_BUILT_MODULE): PRIVATE_DEX_FILE := $(built_dex)
$(LOCAL_BUILT_MODULE): $(built_dex) $(java_resource_sources)

5
core/java.mk
View File

@ -610,7 +610,12 @@ $(built_dex_intermediate): $(jack_all_deps)
@echo Building with Jack: $@
$(jack-java-to-dex)
# The empty command was added because, without it, make misses the fact the $(built_dex) also
# change $(full_classes_jack). Looks like it would test the date before running $(built_dex)
# command.
$(full_classes_jack): $(built_dex_intermediate)
@echo
# nothing to do it's built as a side effect of $(built_dex_intermediate)
endif #LOCAL_IS_STATIC_JAVA_LIBRARY