瀏覽代碼

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
Wink Saville 15 年之前
父節點
當前提交
4e79aac882
共有 1 個文件被更改,包括 4 次插入3 次删除
  1. 4 3
      Android.mk

+ 4 - 3
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)
-