diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2017-02-08 10:45:47 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-08 10:45:47 -0800 |
| commit | a60cc08d838d3075ec0e38e5ed2791d78b200630 (patch) | |
| tree | b0823b587ccdf62da7a618d4a47411d67cf69b00 | |
| parent | cba04b19e88dba2c13241b733bf7f595f1463082 (diff) | |
| parent | 6fffd4adb4dc6c27784be18132ec0b7254b927cc (diff) | |
| download | protobuf-a60cc08d838d3075ec0e38e5ed2791d78b200630.tar.gz protobuf-a60cc08d838d3075ec0e38e5ed2791d78b200630.tar.bz2 protobuf-a60cc08d838d3075ec0e38e5ed2791d78b200630.zip | |
Merge pull request #2691 from cgrushko/patch-3
Bazel can build protobuf when it's not in the root
| -rw-r--r-- | protobuf.bzl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/protobuf.bzl b/protobuf.bzl index 41a46f75..73c396d5 100644 --- a/protobuf.bzl +++ b/protobuf.bzl @@ -263,10 +263,11 @@ def internal_gen_well_known_protos_java(srcs): srcs: the well known protos """ root = Label("%s//protobuf_java" % (REPOSITORY_NAME)).workspace_root + pkg = PACKAGE_NAME + "/" if PACKAGE_NAME else "" if root == "": - include = " -Isrc " + include = " -I%ssrc " % pkg else: - include = " -I%s/src " % root + include = " -I%s/%ssrc " % (root, pkg) native.genrule( name = "gen_well_known_protos_java", srcs = srcs, |