diff options
author | Brian Carlstrom <bdc@google.com> | 2014-05-19 17:04:54 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-19 17:04:54 +0000 |
commit | 8d422a3a0b61e02f4e65f9a762fd2f55e7dc8862 (patch) | |
tree | 5018529aac7cae890da3770fe8f40889e21faf30 /core/clear_vars.mk | |
parent | d9af5a545855f5919c6a8655c2011c9a9c0b30c7 (diff) | |
parent | 8074ff4d0f962a933586b9809d1f1bdffe1fe5ed (diff) | |
download | build-8d422a3a0b61e02f4e65f9a762fd2f55e7dc8862.zip build-8d422a3a0b61e02f4e65f9a762fd2f55e7dc8862.tar.gz build-8d422a3a0b61e02f4e65f9a762fd2f55e7dc8862.tar.bz2 |
am 8074ff4d: am a8355eca: am 64f3a191: Merge "Multilib support for odex"
* commit '8074ff4d0f962a933586b9809d1f1bdffe1fe5ed':
Multilib support for odex
Diffstat (limited to 'core/clear_vars.mk')
-rw-r--r-- | core/clear_vars.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/clear_vars.mk b/core/clear_vars.mk index 723d222..f30e170 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -122,7 +122,7 @@ LOCAL_RENDERSCRIPT_SKIP_INSTALL:= LOCAL_RENDERSCRIPT_TARGET_API:= LOCAL_BUILD_HOST_DEX:= LOCAL_DEX_PREOPT:= # '',true,false,nostripping -LOCAL_DEX_PREOPT_IMAGE:= +LOCAL_DEX_PREOPT_IMAGE_LOCATION:= LOCAL_PROTOC_OPTIMIZE_TYPE:= # lite(default),micro,nano,full LOCAL_PROTOC_FLAGS:= LOCAL_PROTO_JAVA_OUTPUT_PARAMS:= |