Merge "Apply jack redirection flag to also custom ANDROID_JACK_EXTRA_ARGS"

This commit is contained in:
Ying Wang 2015-03-16 20:28:56 +00:00 committed by Android (Google) Code Review
commit f13fb8446a
1 changed files with 3 additions and 1 deletions

View File

@ -447,8 +447,10 @@ endif
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