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