aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools
diff options
context:
space:
mode:
authorGravatar Googler <noreply@google.com>2016-09-30 23:20:35 +0000
committerGravatar Damien Martin-Guillerez <dmarting@google.com>2016-10-04 08:53:24 +0000
commit0bddbc7b3c1878a1ff94911409935d3cd32e974c (patch)
tree0cf58a1fc6b150fe26cf6ce7322ba83583b6e215 /tools
parent292d02341ea2f6c4021b234f22ac634c0fe4da3c (diff)
Add genfiles to include paths to allow full-path imports of generated protos
-- MOS_MIGRATED_REVID=134840789
Diffstat (limited to 'tools')
-rw-r--r--tools/build_defs/apple/swift.bzl3
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/build_defs/apple/swift.bzl b/tools/build_defs/apple/swift.bzl
index 98b6f7e17d..9b496688a7 100644
--- a/tools/build_defs/apple/swift.bzl
+++ b/tools/build_defs/apple/swift.bzl
@@ -176,6 +176,9 @@ def _swift_library_impl(ctx):
# Include the parent directory of the resulting module so LLDB can find it.
include_dirs += set([output_module.dirname])
+ # Include the genfiles root so full-path imports can work for generated protos.
+ include_dirs += set([ctx.configuration.genfiles_dir.path])
+
include_args = ["-I%s" % d for d in include_dirs + objc_includes]
framework_args = ["-F%s" % x for x in framework_dirs]
define_args = ["-D%s" % x for x in ctx.attr.defines]