From 8d24c6add5f0a6640948afccd9976b64a04a8ed3 Mon Sep 17 00:00:00 2001
From: Wink Saville <wink@google.com>
Date: Fri, 5 Nov 2010 11:28:46 -0700
Subject: 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
---
 Android.mk | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'Android.mk')

diff --git a/Android.mk b/Android.mk
index a1338ac..3a0909f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -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)
-
-- 
cgit v1.1