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

Commit 9f1e58aa authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Make javac checkbuilds match jack" 

am: cb8077df

Change-Id: I0d4e5a51cab1de990abd915ae0d0a3599d84fd04
parents 83c6e741 cb8077df

core/java.mk

+2 −4
Original line number Diff line number Diff line
@@ -346,11 +346,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
@@ -663,6 +659,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
@@ -1236,7 +1236,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