diff options
| author | Ulas Kirazci <ulas@google.com> | 2013-07-25 20:31:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-07-25 20:31:48 +0000 |
| commit | 5094e33bddc5bb7ba8c63b725078764450b16973 (patch) | |
| tree | 984f138cf21e51fd6f8f8a47b01509bb0729c7b6 /core/clear_vars.mk | |
| parent | be5813170364c382ca2fbc6500d567065449473e (diff) | |
| parent | 24c7289d242254545785c7cab237fc369b9072f9 (diff) | |
| download | build-5094e33bddc5bb7ba8c63b725078764450b16973.zip build-5094e33bddc5bb7ba8c63b725078764450b16973.tar.gz build-5094e33bddc5bb7ba8c63b725078764450b16973.tar.bz2 | |
Merge "Revert "Allow proto builds to pass in java proto params.""
Diffstat (limited to 'core/clear_vars.mk')
| -rw-r--r-- | core/clear_vars.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/core/clear_vars.mk b/core/clear_vars.mk index 7ad58b2..8d84814 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -120,7 +120,6 @@ LOCAL_BUILD_HOST_DEX:= LOCAL_DEX_PREOPT:= # '',true,false,nostripping LOCAL_PROTOC_OPTIMIZE_TYPE:= # lite(default),micro,nano,full LOCAL_PROTOC_FLAGS:= -LOCAL_PROTO_JAVA_OUTPUT_PARAMS:= LOCAL_NO_CRT:= LOCAL_PROPRIETARY_MODULE:= LOCAL_MODULE_OWNER:= |