diff options
| author | Jisi Liu <jisi.liu@gmail.com> | 2015-10-16 11:44:21 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2015-10-16 11:44:21 -0700 |
| commit | d8701b5741a668c5f2b4781b12f5d5517e38b9e7 (patch) | |
| tree | 8a5da9c979d556695b72a6671d38d9684ea7f385 | |
| parent | 9c7d9c0925ebed800e4e41b298de9d97fd429679 (diff) | |
| download | protobuf-d8701b5741a668c5f2b4781b12f5d5517e38b9e7.tar.gz protobuf-d8701b5741a668c5f2b4781b12f5d5517e38b9e7.tar.bz2 protobuf-d8701b5741a668c5f2b4781b12f5d5517e38b9e7.zip | |
Rename deps/proto_deps to cc_libs/deps
| -rw-r--r-- | BUILD | 4 | ||||
| -rw-r--r-- | protobuf.bzl | 14 |
2 files changed, 8 insertions, 10 deletions
@@ -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 = [ diff --git a/protobuf.bzl b/protobuf.bzl index a745998c..c6685d30 100644 --- a/protobuf.bzl +++ b/protobuf.bzl @@ -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) |