Revert "Revert "Revert "Add soong_javac_filter to all javac commands"""
This reverts commit440079b84b
. 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 (cherry picked from commitfc8ead6609
)
This commit is contained in:
parent
f658305484
commit
37a1d5bc93
5 changed files with 2 additions and 8 deletions
|
@ -499,8 +499,6 @@ SOONG_ZIP := $(SOONG_HOST_OUT_EXECUTABLES)/soong_zip
|
|||
ZIP2ZIP := $(SOONG_HOST_OUT_EXECUTABLES)/zip2zip
|
||||
FILESLIST := $(SOONG_HOST_OUT_EXECUTABLES)/fileslist
|
||||
|
||||
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)),)
|
||||
|
|
|
@ -2219,7 +2219,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 \
|
||||
|
@ -2228,7 +2228,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,)
|
||||
|
|
|
@ -96,8 +96,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)
|
||||
|
||||
|
|
|
@ -74,7 +74,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)
|
||||
|
||||
|
|
|
@ -456,7 +456,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)
|
||||
|
||||
|
|
Loading…
Reference in a new issue