Merge \"Do not force turn off of Jack warning\"

am: 0a26fc0ace Change-Id: Iddfabd648876281596bc8c571968d18589f1f581
2016-06-13 14:44:56 +00:00
parent 74d7b31f7d 0a26fc0ace
commit 5185323de9
2 changed files with 2 additions and 3 deletions
--- a/core/config.mk
+++ b/core/config.mk
@@ -571,8 +571,6 @@ else
 JACK_DEFAULT_ARGS := $(BUILD_SYSTEM)/jack-default.args
 DEFAULT_JACK_EXTRA_ARGS := @$(JACK_DEFAULT_ARGS)
 endif
-# Turn off jack warnings by default.
-DEFAULT_JACK_EXTRA_ARGS += --verbose error

 PROGUARD := external/proguard/bin/proguard.sh
 JAVATAGS := build/tools/java-event-log-tags.py
--- a/core/jack-default.args
+++ b/core/jack-default.args
@@ -3,3 +3,4 @@
 -D sched.runner.thread.fixed.count=4
 --sanity-checks off
 -D jack.reporter.level.file=error=--,warning=-
+--verbose error