commit 52d2253ff9617e0c1ad767274e8627c39776198a
author Colin Cross <ccross@android.com> Fri Feb 17 22:53:42 2017 +0000
committer Colin Cross <ccross@android.com> Fri Feb 17 22:53:42 2017 +0000
tree 18ca9e5a57d81df116a9967de70d8d7ef0f7d26d
parent a341bf0f8636ec42bd87058d9ba31a482cea3b6d

Revert "Add soong_javac_filter to all javac commands"

This reverts commit a341bf0f8636ec42bd87058d9ba31a482cea3b6d.

Breaks grok builds that replace javac with another tool:
reading standard input: bufio.Scanner: token too long

Change-Id: I825587c465b05c1fbddb7794dc1c84f5f2c883d1

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 72c4c00..dbbdd1d 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2217,7 +2217,7 @@
 $(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 \
@@ -2226,7 +2226,7 @@
     -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,)