summaryrefslogtreecommitdiffstats
path: root/core/clear_vars.mk
diff options
context:
space:
mode:
authorEtan Cohen <etancohen@google.com>2015-03-30 16:42:42 -0700
committerEtan Cohen <etancohen@google.com>2015-03-30 16:42:42 -0700
commit5c92a46ea3cbfae0e1451dadfdf016a0277b8e21 (patch)
tree0711722347137f264abd6583ec9ab4cfca16ab7a /core/clear_vars.mk
parent3d4466f3d6abe00a210c8f14ba5daff68533a233 (diff)
parent597cfdb9db079994620333665db992de7c0a99a0 (diff)
downloadbuild-5c92a46ea3cbfae0e1451dadfdf016a0277b8e21.zip
build-5c92a46ea3cbfae0e1451dadfdf016a0277b8e21.tar.gz
build-5c92a46ea3cbfae0e1451dadfdf016a0277b8e21.tar.bz2
Merge commit '597cfdb' into merge
Change-Id: I4df718345626439ece9fdad242cccea7d6930819
Diffstat (limited to 'core/clear_vars.mk')
-rw-r--r--core/clear_vars.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/clear_vars.mk b/core/clear_vars.mk
index 876698a..89b466f 100644
--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -139,7 +139,7 @@ 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_OPTIMIZE_TYPE:= # lite(default),micro,nano,full,nanopb-c,nanopb-c-enable_malloc
LOCAL_PROTOC_FLAGS:=
LOCAL_PROTO_JAVA_OUTPUT_PARAMS:=
LOCAL_NO_CRT:=