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

Commit c8387929 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Filter and colorize javac output V3"

parents 4be1d882 5f89212e

core/config.mk

+2 −0
Original line number Diff line number Diff line
@@ -499,6 +499,8 @@ SOONG_ZIP := $(SOONG_HOST_OUT_EXECUTABLES)/soong_zip 
ZIP2ZIP := $(SOONG_HOST_OUT_EXECUTABLES)/zip2zip

FILESLIST := $(SOONG_HOST_OUT_EXECUTABLES)/fileslist



SOONG_JAVAC_WRAPPER := $(SOONG_HOST_OUT_EXECUTABLES)/soong_javac_wrapper



# Always use prebuilts for ckati and makeparallel

prebuilt_build_tools := prebuilts/build-tools

ifeq ($(filter address,$(SANITIZE_HOST)),)

core/definitions.mk

+1 −1
Original line number Diff line number Diff line
@@ -2206,7 +2206,7 @@ $(if $(PRIVATE_HAS_RS_SOURCES), \ 
$(hide) tr ' ' '\n' < $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list \

    | $(NORMALIZE_PATH) | sort -u > $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq

$(hide) if [ -s $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq ] ; then \

    $(1) -encoding UTF-8 \

    $(SOONG_JAVAC_WRAPPER) $(1) -encoding UTF-8 \

    $(if $(findstring true,$(PRIVATE_WARNINGS_ENABLE)),$(xlint_unchecked),) \

    $(2) \

    $(addprefix -classpath ,$(strip \

core/host_dalvik_java_library.mk

+3 −1
Original line number Diff line number Diff line
@@ -97,7 +97,9 @@ $(full_classes_compiled_jar): \ 
        $(jar_manifest_file) \

        $(proto_java_sources_file_stamp) \

        $(annotation_processor_deps) \

        $(LOCAL_ADDITIONAL_DEPENDENCIES)

        $(NORMALIZE_PATH) \

        $(LOCAL_ADDITIONAL_DEPENDENCIES) \

        | $(SOONG_JAVAC_WRAPPER)

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



my_desugaring :=

core/host_java_library.mk

+2 −1
Original line number Diff line number Diff line
@@ -76,7 +76,8 @@ $(full_classes_compiled_jar): \ 
        $(proto_java_sources_file_stamp) \

        $(annotation_processor_deps) \

        $(NORMALIZE_PATH) \

        $(LOCAL_ADDITIONAL_DEPENDENCIES)

        $(LOCAL_ADDITIONAL_DEPENDENCIES) \

        | $(SOONG_JAVAC_WRAPPER)

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



javac-check : $(full_classes_compiled_jar)

core/java.mk

+2 −1
Original line number Diff line number Diff line
@@ -439,7 +439,8 @@ $(full_classes_compiled_jar): \ 
        $(proto_java_sources_file_stamp) \

        $(annotation_processor_deps) \

        $(NORMALIZE_PATH) \

        $(LOCAL_ADDITIONAL_DEPENDENCIES)

        $(LOCAL_ADDITIONAL_DEPENDENCIES) \

        | $(SOONG_JAVAC_WRAPPER)

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



javac-check : $(full_classes_compiled_jar)