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 | 8d24c6add5f0a6640948afccd9976b64a04a8ed3 (patch) | |
| tree | 9736bf0bf7cb1e486bc7d549032f5f8f0506a130 /Android.mk | |
| parent | aeb2b2a40e2d1c2e210a2f4d29e534fd6ef29be4 (diff) | |
| download | external_protobuf-8d24c6add5f0a6640948afccd9976b64a04a8ed3.zip external_protobuf-8d24c6add5f0a6640948afccd9976b64a04a8ed3.tar.gz external_protobuf-8d24c6add5f0a6640948afccd9976b64a04a8ed3.tar.bz2 | |
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) - |