summaryrefslogtreecommitdiffstats
path: root/core/config.mk
diff options
context:
space:
mode:
authorWink Saville <wink@google.com>2010-11-05 11:28:51 -0700
committerWink Saville <wink@google.com>2010-11-05 11:28:51 -0700
commite789083c06e93ac2055be1789a749b45de522828 (patch)
treeeffa5813c5b2df28584344ef21b3c66dcdefdb55 /core/config.mk
parent3d6bf975bd105b397956f9009ca6b7e5e5f2711d (diff)
downloadbuild-e789083c06e93ac2055be1789a749b45de522828.zip
build-e789083c06e93ac2055be1789a749b45de522828.tar.gz
build-e789083c06e93ac2055be1789a749b45de522828.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: Id6900baacc7d57abee5dc5f694b013d7a42b35c6
Diffstat (limited to 'core/config.mk')
-rw-r--r--core/config.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/config.mk b/core/config.mk
index e2459f6..5805607 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -203,7 +203,7 @@ YACC:= bison -d
DOXYGEN:= doxygen
AAPT := $(HOST_OUT_EXECUTABLES)/aapt$(HOST_EXECUTABLE_SUFFIX)
AIDL := $(HOST_OUT_EXECUTABLES)/aidl$(HOST_EXECUTABLE_SUFFIX)
-PROTOC := $(HOST_OUT_EXECUTABLES)/protoc$(HOST_EXECUTABLE_SUFFIX)
+PROTOC := $(HOST_OUT_EXECUTABLES)/aprotoc$(HOST_EXECUTABLE_SUFFIX)
ICUDATA := $(HOST_OUT_EXECUTABLES)/icudata$(HOST_EXECUTABLE_SUFFIX)
SIGNAPK_JAR := $(HOST_OUT_JAVA_LIBRARIES)/signapk$(COMMON_JAVA_PACKAGE_SUFFIX)
MKBOOTFS := $(HOST_OUT_EXECUTABLES)/mkbootfs$(HOST_EXECUTABLE_SUFFIX)