diff options
| author | Yohann Roussel <yroussel@google.com> | 2015-04-07 12:20:28 +0200 |
|---|---|---|
| committer | Yohann Roussel <yroussel@google.com> | 2015-04-07 23:43:36 +0200 |
| commit | d19166700666d7b84424187c0cdae67a9eb7659e (patch) | |
| tree | a9b02f366c2ec506cecc451db848164f5ea39d22 /core/config.mk | |
| parent | abee3a9f4171a7aaf39c743e7032721b02f43f07 (diff) | |
| download | build-d19166700666d7b84424187c0cdae67a9eb7659e.zip build-d19166700666d7b84424187c0cdae67a9eb7659e.tar.gz build-d19166700666d7b84424187c0cdae67a9eb7659e.tar.bz2 | |
Ignore ANDROID_JACK_VM_ARGS and ANDROID_JACK_EXTRA_ARGS
This is a temporrary workaround allowing to ignore outdated options
given by the build server that may cause OutOfMemoryError when
running Jack server.
Change-Id: I1b6b956de09faaeee1bf6a25c2a63124b69e2645
Diffstat (limited to 'core/config.mk')
| -rw-r--r-- | core/config.mk | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/core/config.mk b/core/config.mk index cbe1227..b54ce40 100644 --- a/core/config.mk +++ b/core/config.mk @@ -444,16 +444,8 @@ 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 |