Add "proto_source_root" flag to proto_library.

Fixes #4544.

RELNOTES: Add "proto_source_root" flag to proto_library.
PiperOrigin-RevId: 185997723

1 files changed, 6 insertions, 2 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/proto/BazelProtoLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/proto/BazelProtoLibrary.java
index 15e0e5f82b..d1cd914016 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/proto/BazelProtoLibrary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/proto/BazelProtoLibrary.java
@@ -44,6 +44,7 @@ public class BazelProtoLibrary implements RuleConfiguredTargetFactory {
 
     NestedSet<Artifact> transitiveImports =
         ProtoCommon.collectTransitiveImports(ruleContext, protoSources);
+    NestedSet<String> protoPathFlags = ProtoCommon.collectTransitiveProtoPathFlags(ruleContext);
 
     NestedSet<Artifact> protosInDirectDeps = ProtoCommon.computeProtosInDirectDeps(ruleContext);
 
@@ -53,6 +54,7 @@ public class BazelProtoLibrary implements RuleConfiguredTargetFactory {
             protoSources,
             protosInDirectDeps,
             transitiveImports,
+            protoPathFlags,
             !protoSources.isEmpty());
 
     Artifact descriptorSetOutput =
@@ -71,7 +73,8 @@ public class BazelProtoLibrary implements RuleConfiguredTargetFactory {
         protosInDirectDeps,
         descriptorSetOutput,
         true /* allowServices */,
-        dependenciesDescriptorSets);
+        dependenciesDescriptorSets,
+        protoPathFlags);
 
     Runfiles dataRunfiles =
         ProtoCommon.createDataRunfilesProvider(transitiveImports, ruleContext)
@@ -86,7 +89,8 @@ public class BazelProtoLibrary implements RuleConfiguredTargetFactory {
             protoSources,
             checkDepsProtoSources,
             descriptorSetOutput,
-            transitiveDescriptorSetOutput);
+            transitiveDescriptorSetOutput,
+            protoPathFlags);
 
     return new RuleConfiguredTargetBuilder(ruleContext)
         .setFilesToBuild(NestedSetBuilder.create(STABLE_ORDER, descriptorSetOutput))