diff options
| author | Yohann Roussel <yroussel@google.com> | 2015-02-05 08:37:40 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-05 08:37:42 +0000 |
| commit | 4283c36732bdad865ab4192521bc973501a4248f (patch) | |
| tree | 11e25b60565c8a6ffb9bcb03d4ab6694184fece2 /core/base_rules.mk | |
| parent | 18202932d10f6467950be5ed2c5d7a2e80214925 (diff) | |
| parent | 2809666941aceea4af65ec6f9cea8cce1c1392ed (diff) | |
| download | build-4283c36732bdad865ab4192521bc973501a4248f.zip build-4283c36732bdad865ab4192521bc973501a4248f.tar.gz build-4283c36732bdad865ab4192521bc973501a4248f.tar.bz2 | |
Merge "Simplify handling of ANDROID_JACK_* variables"
Diffstat (limited to 'core/base_rules.mk')
| -rw-r--r-- | core/base_rules.mk | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/core/base_rules.mk b/core/base_rules.mk index 6b83860..7355c30 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -706,27 +706,8 @@ endif # LOCAL_SDK_VERSION endif # TARGET_ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_STATIC_JACK_LIBRARIES := $(full_static_jack_libs) - -$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_VM_ARGS := $(DEFAULT_JACK_VM_ARGS) -ifneq ($(ANDROID_JACK_VM_ARGS),) -$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_VM_ARGS := $(ANDROID_JACK_VM_ARGS) -endif -ifneq ($(LOCAL_JACK_VM_ARGS),) $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_VM_ARGS := $(LOCAL_JACK_VM_ARGS) -endif - -$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_EXTRA_ARGS := $(DEFAULT_JACK_EXTRA_ARGS) -ifneq ($(ANDROID_JACK_EXTRA_ARGS),) -$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_EXTRA_ARGS := $(ANDROID_JACK_EXTRA_ARGS) -endif -ifneq ($(LOCAL_JACK_EXTRA_ARGS),) $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_EXTRA_ARGS := $(LOCAL_JACK_EXTRA_ARGS) -endif - -$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_VM := $(DEFAULT_JACK_VM) -ifneq ($(strip $(ANDROID_JACK_VM)),) -$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_VM := $(ANDROID_JACK_VM) -endif ifdef LOCAL_IS_HOST_MODULE ifeq ($(USE_CORE_LIB_BOOTCLASSPATH),true) |