diff options
| author | Ying Wang <wangying@google.com> | 2014-10-09 19:31:56 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-10-09 19:31:56 -0700 |
| commit | ca3641d600007177542c46358e1cff069adcf95b (patch) | |
| tree | a55eaae236b2f756dd93286daf111e1310aebbef /core/clear_vars.mk | |
| parent | 6f1e56ad475ced0a3f8854bc4c4fac1ee2d5f37c (diff) | |
| parent | 3907c03e24a42513dae8544a19f3cefb813a1c54 (diff) | |
| download | build-ca3641d600007177542c46358e1cff069adcf95b.zip build-ca3641d600007177542c46358e1cff069adcf95b.tar.gz build-ca3641d600007177542c46358e1cff069adcf95b.tar.bz2 | |
resolved conflicts for merge of 3907c03e to lmp-mr1-dev-plus-aosp
Change-Id: I6900c8cdf1d161fbcede73547fad1750df9abab6
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:= |