bazel: handle proto_src_root when dealing with proto includes, generated files and C++ headers

This change completes the handling of proto_src_root when it comes to inclusion of protos, generating the proto files in the right place and adding the generated headers to the include paths.

WANT_LGTM=elenairina
RELNOTES: None.
PiperOrigin-RevId: 208457740

1 files changed, 5 insertions, 0 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/proto/SupportData.java b/src/main/java/com/google/devtools/build/lib/rules/proto/SupportData.java
index c3bc3aa553..b3644d4c17 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/proto/SupportData.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/proto/SupportData.java
@@ -35,6 +35,7 @@ public abstract class SupportData {
       NestedSet<Artifact> protosInDirectDeps,
       NestedSet<Artifact> transitiveImports,
       NestedSet<String> transitiveProtoPathFlags,
+      String protoSourceRoot,
       NestedSet<String> directProtoSourceRoots,
       boolean hasProtoSources) {
     return new AutoValue_SupportData(
@@ -43,6 +44,7 @@ public abstract class SupportData {
         transitiveImports,
         protosInDirectDeps,
         transitiveProtoPathFlags,
+        protoSourceRoot,
         directProtoSourceRoots,
         hasProtoSources);
   }
@@ -64,6 +66,9 @@ public abstract class SupportData {
    */
   public abstract NestedSet<String> getTransitiveProtoPathFlags();
 
+  /** The {@code proto_source_root} of the current library. */
+  public abstract String getProtoSourceRoot();
+
   /**
    * The {@code proto_source_root}'s collected from the current library and the direct dependencies.
    */