diff options
| author | Yohann Roussel <yroussel@google.com> | 2014-12-04 09:27:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-04 09:27:14 +0000 |
| commit | 75dbbb6e0f3baf1c5a356b605ce2a7ebacf66faa (patch) | |
| tree | 2214ff92d3faafef4c93949cc9ba1dd0e0b18d5d /core/clear_vars.mk | |
| parent | 711b3e3e4ca245e93f024e7bf3e7a43e3f2c3c97 (diff) | |
| parent | b4c49cba57dafdcdfb693a549c5a1dc1beb71c25 (diff) | |
| download | build-75dbbb6e0f3baf1c5a356b605ce2a7ebacf66faa.zip build-75dbbb6e0f3baf1c5a356b605ce2a7ebacf66faa.tar.gz build-75dbbb6e0f3baf1c5a356b605ce2a7ebacf66faa.tar.bz2 | |
Merge "Compile using Jack."
Diffstat (limited to 'core/clear_vars.mk')
| -rw-r--r-- | core/clear_vars.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/core/clear_vars.mk b/core/clear_vars.mk index 5c1a58d..6e7b6b1 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -73,6 +73,7 @@ LOCAL_JAVA_LIBRARIES:= LOCAL_JAVA_LAYERS_FILE:= LOCAL_NO_STANDARD_LIBRARIES:= LOCAL_CLASSPATH:= +LOCAL_JACK_CLASSPATH:= LOCAL_DROIDDOC_USE_STANDARD_DOCLET:= LOCAL_DROIDDOC_SOURCE_PATH:= LOCAL_DROIDDOC_TEMPLATE_DIR:= @@ -106,6 +107,10 @@ LOCAL_JARJAR_RULES:= 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_JACK_FLAGS:= LOCAL_CERTIFICATE:= LOCAL_SDK_VERSION:= LOCAL_SDK_RES_VERSION:= @@ -113,6 +118,7 @@ LOCAL_NDK_STL_VARIANT:= LOCAL_EMMA_INSTRUMENT:= LOCAL_PROGUARD_ENABLED:= # '',full,custom,nosystem,disabled,obfuscation,optimization LOCAL_PROGUARD_FLAGS:= +LOCAL_JACK_PROGUARD_FLAGS:= LOCAL_PROGUARD_FLAG_FILES:= LOCAL_TEST_MODULE_TO_PROGUARD_WITH:= LOCAL_EMMA_COVERAGE_FILTER:= |