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

Commit b16f288b authored by Colin Cross's avatar Colin Cross
Browse files

Make javac checkbuilds match jack 

Building all java to dex is very slow.  Make javac checkbuilds act
like jack checkbuilds and only build to class files for unused
modules, and add a java-dex target that can be used to build
everything to dex.

Bug: 33105206
Test: m -j checkbuild
Change-Id: Idcf9c9e0223b9dd88aaa53beb0cb50a230034b0f
Merged-In: Idcf9c9e0223b9dd88aaa53beb0cb50a230034b0f
(cherry picked from commit 9eff830f)
parent c4b1823c

core/java.mk

+2 −4
Original line number Diff line number Diff line
@@ -350,11 +350,7 @@ else 
LOCAL_CHECKED_MODULE := $(jack_check_timestamp)

endif

else

ifeq ($(LOCAL_IS_STATIC_JAVA_LIBRARY),true)

LOCAL_CHECKED_MODULE := $(full_classes_compiled_jar)

else

LOCAL_CHECKED_MODULE := $(built_dex)

endif

endif

endif

endif
@@ -665,6 +661,8 @@ $(built_dex): $(built_dex_intermediate) 
	$(hide) rm -f $(dir $@)/classes*.dex

	$(hide) cp -fp $(dir $<)/classes*.dex $(dir $@)



java-dex: $(built_dex)



endif # !LOCAL_IS_STATIC_JAVA_LIBRARY



findbugs_xml := $(intermediates.COMMON)/findbugs.xml

core/main.mk

+1 −1
Original line number Diff line number Diff line
@@ -1080,7 +1080,7 @@ $(call dist-for-goals,sdk win_sdk, \ 
# umbrella targets to assit engineers in verifying builds

.PHONY: java native target host java-host java-target native-host native-target \

        java-host-tests java-target-tests native-host-tests native-target-tests \

        java-tests native-tests host-tests target-tests tests

        java-tests native-tests host-tests target-tests tests java-dex

# some synonyms

.PHONY: host-java target-java host-native target-native \

        target-java-tests target-native-tests