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

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

Revert "Revert "Revert "Add soong_javac_filter to all javac commands""" 

This reverts commit 440079b8.

Adding the pipe interferes with error codes, which results
in an empty classes-full-debug.jar output file being left
after the failure.  The next build sees the output file with
an up-to-date timestamp and doesn't rerun the failing rule.

Bug: 36666657
Change-Id: I6658edb766d8ba3120f88e3d8d6eda6ea6c691da
parent 440079b8

core/config.mk

+0 −2
Original line number Diff line number Diff line
@@ -497,8 +497,6 @@ MAINDEXCLASSES := $(HOST_OUT_EXECUTABLES)/mainDexClasses 
SOONG_ZIP := $(SOONG_HOST_OUT_EXECUTABLES)/soong_zip

ZIP2ZIP := $(SOONG_HOST_OUT_EXECUTABLES)/zip2zip



JAVAC_FILTER := $(SOONG_HOST_OUT_EXECUTABLES)/soong_javac_filter



# Always use prebuilts for ckati and makeparallel

prebuilt_build_tools := prebuilts/build-tools

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

core/definitions.mk

+2 −2
Original line number Diff line number Diff line
@@ -2236,7 +2236,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 \

    $(1) -encoding UTF-8 \

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

    $(2) \

    $(addprefix -classpath ,$(strip \
@@ -2245,7 +2245,7 @@ $(hide) if [ -s $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq ] ; the 
    -extdirs "" -d $(PRIVATE_CLASS_INTERMEDIATES_DIR) \

    $(PRIVATE_JAVACFLAGS) \

    \@$(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq \

    || ( rm -rf $(PRIVATE_CLASS_INTERMEDIATES_DIR) ; exit 41 ) ) 2>&1 | $(JAVAC_FILTER); \

    || ( rm -rf $(PRIVATE_CLASS_INTERMEDIATES_DIR) ; exit 41 ) \

fi

$(if $(PRIVATE_JAVA_LAYERS_FILE), $(hide) build/tools/java-layers.py \

    $(PRIVATE_JAVA_LAYERS_FILE) \@$(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq,)

core/host_dalvik_java_library.mk

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

        $(jar_manifest_file) \

        $(proto_java_sources_file_stamp) \

        $(NORMALIZE_PATH) \

        $(JAVAC_FILTER) \

        $(LOCAL_ADDITIONAL_DEPENDENCIES)

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

core/host_java_library.mk

+0 −1
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ $(full_classes_compiled_jar): \ 
        $(jar_manifest_file) \

        $(proto_java_sources_file_stamp) \

        $(NORMALIZE_PATH) \

        $(JAVAC_FILTER) \

        $(LOCAL_ADDITIONAL_DEPENDENCIES)

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

core/java.mk

+0 −1
Original line number Diff line number Diff line
@@ -446,7 +446,6 @@ $(full_classes_compiled_jar): \ 
        $(RenderScript_file_stamp) \

        $(proto_java_sources_file_stamp) \

        $(NORMALIZE_PATH) \

        $(JAVAC_FILTER) \

        $(LOCAL_ADDITIONAL_DEPENDENCIES)

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