diff options
| author | Wink Saville <wink@google.com> | 2010-11-05 11:28:46 -0700 |
|---|---|---|
| committer | Wink Saville <wink@google.com> | 2010-11-05 11:28:46 -0700 |
| commit | 4e79aac882eb7d90eee4ab608acdfb6032da944d (patch) | |
| tree | 01a4628a468dfda8d167a95b5fbfeb28536f39ad /Android.mk | |
| parent | f5bc288bb246b55cc9ba76f10a70498e4dcceeee (diff) | |
| download | protobuf-4e79aac882eb7d90eee4ab608acdfb6032da944d.tar.gz protobuf-4e79aac882eb7d90eee4ab608acdfb6032da944d.tar.bz2 protobuf-4e79aac882eb7d90eee4ab608acdfb6032da944d.zip | |
Rename protoc to aprotoc.
With gLucid protoc is installed in the base system, by renaming
our version there will be no confusion about which compiler is
being used.
Change-Id: I975e29e4444af9467c9b9600d5a2e7027f4046ae
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -272,11 +272,13 @@ LOCAL_CFLAGS := -DGOOGLE_PROTOBUF_NO_RTTI include $(BUILD_STATIC_LIBRARY) -# Protocol buffer compiler (host executable) +# Android Protocol buffer compiler, aprotoc (host executable) +# used by the build systems as $(PROTOC) defined in +# build/core/config.mk # ======================================================= include $(CLEAR_VARS) -LOCAL_MODULE := protoc +LOCAL_MODULE := aprotoc LOCAL_MODULE_CLASS := EXECUTABLES LOCAL_MODULE_TAGS := optional @@ -291,4 +293,3 @@ LOCAL_STATIC_LIBRARIES += libz LOCAL_LDLIBS := -lpthread include $(BUILD_HOST_EXECUTABLE) - |