AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Rename deps/proto_deps to cc_libs/deps

Browse Source
This commit is contained in:
Jisi Liu 2015-10-16 11:44:21 -07:00
parent 9c7d9c0925
commit d8701b5741
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BUILD
View File

@ -147,7 +147,7 @@ cc_proto_library(
srcs = ["src/" + s for s in WELL_KNOWN_PROTOS],
internal_bootstrap_hack = 1,
prefix = "src",
deps = ":protobuf",
cc_libs = [":protobuf"],
)
################################################################################
@ -341,7 +341,7 @@ cc_proto_library(
name = "cc_test_protos",
srcs = ["src/" + s for s in (LITE_TEST_PROTOS + TEST_PROTOS)],
prefix = "src",
proto_deps = [":cc_wkt_protos"],
deps = [":cc_wkt_protos"],
)
COMMON_TEST_SRCS = [

14
protobuf.bzl
View File

@ -71,8 +71,8 @@ def cc_proto_library(
protoc=":protoc",
internal_bootstrap_hack=False,
prefix="",
proto_deps=[],
deps=[],
cc_libs=[],
**kargs):
if internal_bootstrap_hack:
@ -81,22 +81,21 @@ def cc_proto_library(
_proto_gen(
name=name + "_genproto",
srcs=srcs,
deps=[s + "_genproto" for s in proto_deps],
deps=[s + "_genproto" for s in deps],
prefix=prefix,
protoc=protoc,
)
# An empty cc_library to make rule dependency consistent.
native.cc_library(
name=name,
**kargs,
)
**kargs)
return
outs = _cc_outs(srcs)
_proto_gen(
name=name + "_genproto",
srcs=srcs,
deps=[s + "_genproto" for s in proto_deps],
deps=[s + "_genproto" for s in deps],
prefix=prefix,
protoc=protoc,
gen_cc=1,
@ -106,7 +105,6 @@ def cc_proto_library(
native.cc_library(
name=name,
srcs=outs,
deps=deps + proto_deps,
deps=cc_libs + deps,
includes=[prefix],
**kargs,
)
**kargs)