commit 2809666941aceea4af65ec6f9cea8cce1c1392ed
author Yohann Roussel <yroussel@google.com> Mon Feb 02 12:18:20 2015 +0100
committer Yohann Roussel <yroussel@google.com> Tue Feb 03 12:37:09 2015 +0100
tree c59d4d18cd131c1df88b42d79584712be7902eb2
parent 38a9d5a739cb95758e3f40cb240c1511a309d4f7

Simplify handling of ANDROID_JACK_* variables

This concerns ANDROID_JACK_VM, ANDROID_JACK_VM_ARGS and
ANDROID_JACK_EXTRA_ARGS.

Change-Id: Iba75ecaaceb09ac9607a3aee41324d9f5ae4beef

core/clear_vars.mk

diff --git a/core/clear_vars.mk b/core/clear_vars.mk
index bc6661e..085b5fc 100644
--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -107,9 +107,9 @@
 LOCAL_ADDITIONAL_JAVA_DIR:=
 LOCAL_ALLOW_UNDEFINED_SYMBOLS:=
 LOCAL_DX_FLAGS:=
-LOCAL_USE_JACK:=$(ANDROID_COMPILE_WITH_JACK)
-LOCAL_JACK_VM_ARGS :=
-LOCAL_JACK_EXTRA_ARGS :=
+LOCAL_USE_JACK:= $(ANDROID_COMPILE_WITH_JACK)
+LOCAL_JACK_VM_ARGS := $(DEFAULT_JACK_VM_ARGS)
+LOCAL_JACK_EXTRA_ARGS := $(DEFAULT_JACK_EXTRA_ARGS)
 LOCAL_JACK_FLAGS:=
 LOCAL_CERTIFICATE:=
 LOCAL_SDK_VERSION:=