Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
P
protobuf
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
protobuf
Commits
d8701b57
Commit
d8701b57
authored
Oct 16, 2015
by
Jisi Liu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename deps/proto_deps to cc_libs/deps
parent
9c7d9c09
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
10 deletions
+8
-10
BUILD
BUILD
+2
-2
protobuf.bzl
protobuf.bzl
+6
-8
No files found.
BUILD
View file @
d8701b57
...
@@ -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 = [
...
...
protobuf.bzl
View file @
d8701b57
...
@@ -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
)
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment