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

Commit cddeb6c4 authored by Ying Wang's avatar Ying Wang
Browse files

Add phony target javac-check. 

javac-check covers all classes.jars that are compiled with javac
instead of jack. This target is required by tools that still need java
class files as input.

Bug: 26705771
Change-Id: I6896b9a6026a2a0dae6145d1ef5a839756aa3458
parent cdc8f211

core/host_dalvik_java_library.mk

+2 −0
Original line number Diff line number Diff line
@@ -85,6 +85,8 @@ $(full_classes_compiled_jar): \ 
        $(LOCAL_ADDITIONAL_DEPENDENCIES)

	$(transform-host-java-to-package)



javac-check : $(full_classes_compiled_jar)



# Run jarjar if necessary, otherwise just copy the file.

ifneq ($(strip $(LOCAL_JARJAR_RULES)),)

$(full_classes_jarjar_jar): PRIVATE_JARJAR_RULES := $(LOCAL_JARJAR_RULES)

core/host_java_library.mk

+2 −1
Original line number Diff line number Diff line
@@ -69,6 +69,8 @@ $(full_classes_compiled_jar): \ 
        $(LOCAL_ADDITIONAL_DEPENDENCIES)

	$(transform-host-java-to-package)



javac-check : $(full_classes_compiled_jar)



# Run jarjar if necessary, otherwise just copy the file.

ifneq ($(strip $(LOCAL_JARJAR_RULES)),)

$(full_classes_jarjar_jar): PRIVATE_JARJAR_RULES := $(LOCAL_JARJAR_RULES)
@@ -105,4 +107,3 @@ $(built_javalib_jar): $(full_classes_jarjar_jar) | $(ACP) 
	@echo Copying: $@

	$(hide) $(ACP) -fp $< $@

endif # LOCAL_EMMA_INSTRUMENT

core/java.mk

+2 −0
Original line number Diff line number Diff line
@@ -433,6 +433,8 @@ $(full_classes_compiled_jar): \ 
        $(LOCAL_ADDITIONAL_DEPENDENCIES)

	$(transform-java-to-classes.jar)



javac-check : $(full_classes_compiled_jar)



# Run jarjar if necessary, otherwise just copy the file.

ifneq ($(strip $(LOCAL_JARJAR_RULES)),)

$(full_classes_jarjar_jar): PRIVATE_JARJAR_RULES := $(LOCAL_JARJAR_RULES)

core/main.mk

+3 −0
Original line number Diff line number Diff line
@@ -1041,6 +1041,9 @@ target-java-tests : java-target-tests 
target-native-tests : native-target-tests

tests : host-tests target-tests



# Phony target to run all java compilations that use javac instead of jack.

.PHONY: javac-check



# To catch more build breakage, check build tests modules in eng and userdebug builds.

ifneq ($(ANDROID_NO_TEST_CHECK),true)

ifneq ($(TARGET_BUILD_PDK),true)