fix(textproto): workaround upstream proto path bug

kythe/cxx/indexer/proto/testdata/proto_verifier_test.bzl

@@ -40,7 +40,17 @@ def get_proto_files_and_proto_paths(protolibs):
         for src in info.direct_sources:
             toplevel_srcs.append(src)
     all_srcs = depset([], transitive = [lib[ProtoInfo].transitive_sources for lib in protolibs])
-    proto_paths = depset(transitive = [lib[ProtoInfo].transitive_proto_path for lib in protolibs])
+    proto_paths = depset(
+        transitive = [lib[ProtoInfo].transitive_proto_path for lib in protolibs] +
+                     # Workaround for https://github.com/bazelbuild/bazel/issues/7964.
+                     # Since we can't rely on ProtoInfo to provide accurate roots, generate them here.
+                     [depset([
+                         src.root.path
+                         for src in depset(toplevel_srcs, transitive = [all_srcs], order = "postorder").to_list()
+                         if src.root.path
+                     ])],
+        order = "postorder",
+    )
     return toplevel_srcs, all_srcs, proto_paths
 
 def _proto_extract_kzip_impl(ctx):

kythe/cxx/indexer/textproto/testdata/BUILD

@@ -46,6 +46,15 @@ textproto_verifier_test(
     textprotos = ["imports.pbtxt"],
 )
 
+textproto_verifier_test(
+    name = "imports_generated_test",
+    protos = [
+        ":generated_proto",
+        ":imports_generated_proto",
+    ],
+    textprotos = ["generated_imports.pbtxt"],
+)
+
 textproto_verifier_test(
     name = "extensions_test",
     protos = [":extensions_proto"],
@@ -108,3 +117,21 @@ proto_library(
     name = "repeated_extension_proto",
     srcs = ["repeated_extension.proto"],
 )
+
+genrule(
+    name = "generate_proto",
+    srcs = ["example.proto"],
+    outs = ["generated.proto"],
+    cmd = "cp $< $@",
+)
+
+proto_library(
+    name = "generated_proto",
+    srcs = [":generated.proto"],
+)
+
+proto_library(
+    name = "imports_generated_proto",
+    srcs = ["imports_generated.proto"],
+    deps = [":generated_proto"],
+)

kythe/cxx/indexer/textproto/testdata/generated_imports.pbtxt

@@ -0,0 +1,8 @@
+# proto-message: example2.OuterMessage
+# proto-file: kythe/cxx/indexer/textproto/testdata/imports_generated.proto
+
+#- @inner_msg ref OuterMessageInnerMsg
+inner_msg {
+    #- @field1 ref Field1
+    field1: "hello"
+}

kythe/cxx/indexer/textproto/testdata/imports_generated.proto

@@ -0,0 +1,10 @@
+syntax = "proto2";
+
+package example2;
+
+import "kythe/cxx/indexer/textproto/testdata/generated.proto";
+
+message OuterMessage {
+  //- @inner_msg defines/binding OuterMessageInnerMsg
+  optional example.Message2 inner_msg = 1;
+};