commit e9f0226655195d9b07d0060985bc9def73dbabc1
author Ying Wang <wangying@google.com> Mon Mar 16 11:59:41 2015 -0700
committer Ying Wang <wangying@google.com> Mon Mar 16 11:59:41 2015 -0700
tree 51cd7f54b931c68caac112e560b8d99a489e86f7
parent 1ccaa8fbd8cb68f6115a25f30ad3d34a15ee3da2

Apply jack redirection flag to also custom ANDROID_JACK_EXTRA_ARGS

Bug: 19715777
Change-Id: I4ad9c9f51bf418afe29f5a682f630d6071cd33a2

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index 3811190..6e7c697 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -447,8 +447,10 @@
 ifneq ($(ANDROID_JACK_EXTRA_ARGS),)
 DEFAULT_JACK_EXTRA_ARGS := $(ANDROID_JACK_EXTRA_ARGS)
 else
-DEFAULT_JACK_EXTRA_ARGS := --sanity-checks off -D jack.reporter.level.file=error=--,warning=-
+DEFAULT_JACK_EXTRA_ARGS := --sanity-checks off
 endif
+# Redirect jack warnings to stdout.
+DEFAULT_JACK_EXTRA_ARGS += -D jack.reporter.level.file=error=--,warning=-
 
 JILL := java -Xmx3500m -cp $(JILL_JAR) com.android.jill.Main
 PROGUARD := external/proguard/bin/proguard.sh