diff options
| author | Yohann Roussel <yroussel@google.com> | 2015-04-09 10:10:21 +0000 |
|---|---|---|
| committer | Yohann Roussel <yroussel@google.com> | 2015-04-09 10:10:21 +0000 |
| commit | e163b4e2e82c788f750d155f97290762d22bb222 (patch) | |
| tree | 5ea1c670ab3b8f364b669549f289531511f5a0df /core/config.mk | |
| parent | d19166700666d7b84424187c0cdae67a9eb7659e (diff) | |
| download | build-e163b4e2e82c788f750d155f97290762d22bb222.zip build-e163b4e2e82c788f750d155f97290762d22bb222.tar.gz build-e163b4e2e82c788f750d155f97290762d22bb222.tar.bz2 | |
Revert "Ignore ANDROID_JACK_VM_ARGS and ANDROID_JACK_EXTRA_ARGS"
This reverts commit d19166700666d7b84424187c0cdae67a9eb7659e.
Build server are no longer giving outdated options.
Change-Id: Idece7efc45bb42a39364f721a7e6a576705dc926
Diffstat (limited to 'core/config.mk')
| -rw-r--r-- | core/config.mk | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/core/config.mk b/core/config.mk index b54ce40..cbe1227 100644 --- a/core/config.mk +++ b/core/config.mk @@ -444,8 +444,16 @@ define call-jack $(JACK_SERVER_LOG_COMMAND) JACK_VM_COMMAND="$(JACK_VM) $(1) $(JAVA_TMPDIR_ARG)" JACK_JAR="$(JACK_JAR)" $(JACK) $(2) endef $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_VM_ARGS := $(DEFAULT_JACK_VM_ARGS) +ifneq ($(ANDROID_JACK_VM_ARGS),) +DEFAULT_JACK_VM_ARGS := $(ANDROID_JACK_VM_ARGS) +else DEFAULT_JACK_VM_ARGS := -Dfile.encoding=UTF-8 -Xms2560m -XX:+TieredCompilation +endif +ifneq ($(ANDROID_JACK_EXTRA_ARGS),) +DEFAULT_JACK_EXTRA_ARGS := $(ANDROID_JACK_EXTRA_ARGS) +else DEFAULT_JACK_EXTRA_ARGS := -D sched.runner=multi-threaded -D sched.runner.thread.kind=fixed -D sched.runner.thread.fixed.count=4 --sanity-checks off -D jack.reporter.level.file=error=--,warning=- +endif # Turn off jack warnings by default. DEFAULT_JACK_EXTRA_ARGS += --verbose error |