diff options
author | Brian Carlstrom <bdc@google.com> | 2014-05-19 16:53:35 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-19 16:53:35 +0000 |
commit | a8355ecaadf9a0d052165d0cc14564927eb9a202 (patch) | |
tree | 6f4633a53a806f3f4cd9759324b5bb221798d97b /core/clear_vars.mk | |
parent | c0f0e8cab7268d372b5bded8b141133c2257f964 (diff) | |
parent | 64f3a191f92a6ab84a8175ad480633b8c58ac900 (diff) | |
download | build-a8355ecaadf9a0d052165d0cc14564927eb9a202.zip build-a8355ecaadf9a0d052165d0cc14564927eb9a202.tar.gz build-a8355ecaadf9a0d052165d0cc14564927eb9a202.tar.bz2 |
am 64f3a191: Merge "Multilib support for odex"
* commit '64f3a191f92a6ab84a8175ad480633b8c58ac900':
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 5bb45d8..5b798e3 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -119,7 +119,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:= |