diff options
| author | Ying Wang <wangying@google.com> | 2014-10-09 19:29:53 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-10-09 19:29:53 -0700 |
| commit | 8755756f26a1eaf384ecae64fd00c1873abcf26f (patch) | |
| tree | 72141d9f642c660bb9cbae0fc3f18942c444694d /core/clear_vars.mk | |
| parent | 37df3be46dfc74fa4ec355554a582014ec77e64b (diff) | |
| parent | 3907c03e24a42513dae8544a19f3cefb813a1c54 (diff) | |
| download | build-8755756f26a1eaf384ecae64fd00c1873abcf26f.zip build-8755756f26a1eaf384ecae64fd00c1873abcf26f.tar.gz build-8755756f26a1eaf384ecae64fd00c1873abcf26f.tar.bz2 | |
resolved conflicts for merge of 3907c03e to lmp-dev-plus-aosp
Change-Id: I580ab0693609ff506da7346548a45322000114d1
Diffstat (limited to 'core/clear_vars.mk')
| -rw-r--r-- | core/clear_vars.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/clear_vars.mk b/core/clear_vars.mk index ff20255..8ee7734 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -127,6 +127,7 @@ LOCAL_RENDERSCRIPT_SKIP_INSTALL:= LOCAL_RENDERSCRIPT_TARGET_API:= LOCAL_DEX_PREOPT:= # '',true,false,nostripping LOCAL_DEX_PREOPT_IMAGE_LOCATION:= +LOCAL_DEX_PREOPT_FLAGS:= LOCAL_PROTOC_OPTIMIZE_TYPE:= # lite(default),micro,nano,full LOCAL_PROTOC_FLAGS:= LOCAL_PROTO_JAVA_OUTPUT_PARAMS:= |