Commit d8701b57 authored by Jisi Liu's avatar Jisi Liu

Rename deps/proto_deps to cc_libs/deps

parent 9c7d9c09
...@@ -147,7 +147,7 @@ cc_proto_library( ...@@ -147,7 +147,7 @@ cc_proto_library(
srcs = ["src/" + s for s in WELL_KNOWN_PROTOS], srcs = ["src/" + s for s in WELL_KNOWN_PROTOS],
internal_bootstrap_hack = 1, internal_bootstrap_hack = 1,
prefix = "src", prefix = "src",
deps = ":protobuf", cc_libs = [":protobuf"],
) )
################################################################################ ################################################################################
...@@ -341,7 +341,7 @@ cc_proto_library( ...@@ -341,7 +341,7 @@ cc_proto_library(
name = "cc_test_protos", name = "cc_test_protos",
srcs = ["src/" + s for s in (LITE_TEST_PROTOS + TEST_PROTOS)], srcs = ["src/" + s for s in (LITE_TEST_PROTOS + TEST_PROTOS)],
prefix = "src", prefix = "src",
proto_deps = [":cc_wkt_protos"], deps = [":cc_wkt_protos"],
) )
COMMON_TEST_SRCS = [ COMMON_TEST_SRCS = [
......
...@@ -71,8 +71,8 @@ def cc_proto_library( ...@@ -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( ...@@ -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( ...@@ -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)
)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment