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

Commit 348522fa authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Revert "Revert "Add soong_javac_filter to all javac commands""" am:... 

Merge "Revert "Revert "Add soong_javac_filter to all javac commands""" am: 29f3642d am: 58ffd38f
am: 77b7e12e

Change-Id: I7a62df5e9eca3304ec753ea887b8d7b01ce938f4
parents 12389914 77b7e12e

core/config.mk

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

SOONG_ZIP := $(SOONG_HOST_OUT_EXECUTABLES)/soong_zip

ZIP2ZIP := $(SOONG_HOST_OUT_EXECUTABLES)/zip2zip

ZIP2ZIP := $(SOONG_HOST_OUT_EXECUTABLES)/zip2zip





JAVAC_FILTER := $(SOONG_HOST_OUT_EXECUTABLES)/soong_javac_filter



# Always use prebuilts for ckati and makeparallel

# Always use prebuilts for ckati and makeparallel

prebuilt_build_tools := prebuilts/build-tools

prebuilt_build_tools := prebuilts/build-tools

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

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

core/definitions.mk

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

$(hide) tr ' ' '\n' < $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list \

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

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

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

$(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),) \

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

    $(2) \

    $(2) \

    $(addprefix -classpath ,$(strip \

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

    -extdirs "" -d $(PRIVATE_CLASS_INTERMEDIATES_DIR) \

    $(PRIVATE_JAVACFLAGS) \

    $(PRIVATE_JAVACFLAGS) \

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

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

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

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

fi

fi

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

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

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

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

core/host_dalvik_java_library.mk

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

        $(full_java_lib_deps) \

        $(jar_manifest_file) \

        $(jar_manifest_file) \

        $(proto_java_sources_file_stamp) \

        $(proto_java_sources_file_stamp) \

        $(NORMALIZE_PATH) \

        $(JAVAC_FILTER) \

        $(LOCAL_ADDITIONAL_DEPENDENCIES)

        $(LOCAL_ADDITIONAL_DEPENDENCIES)

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

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

core/host_java_library.mk

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

        $(jar_manifest_file) \

        $(proto_java_sources_file_stamp) \

        $(proto_java_sources_file_stamp) \

        $(NORMALIZE_PATH) \

        $(NORMALIZE_PATH) \

        $(JAVAC_FILTER) \

        $(LOCAL_ADDITIONAL_DEPENDENCIES)

        $(LOCAL_ADDITIONAL_DEPENDENCIES)

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

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

core/java.mk

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

        $(RenderScript_file_stamp) \

        $(proto_java_sources_file_stamp) \

        $(proto_java_sources_file_stamp) \

        $(NORMALIZE_PATH) \

        $(NORMALIZE_PATH) \

        $(JAVAC_FILTER) \

        $(LOCAL_ADDITIONAL_DEPENDENCIES)

        $(LOCAL_ADDITIONAL_DEPENDENCIES)

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

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