Merge "Apply jack redirection flag to also custom ANDROID_JACK_EXTRA_ARGS" (f13fb844) · Commits · e / os / android_build

core/config.mk

+3 −1

Original line number	Diff line number	Diff line
		@@ -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