Make J2ObjcAspect#getProtoOutputRoot compatible with --experimental_s…

…ibling_repository_layout.

It currently adds the repository's exec path. Since it starts with ".." when the flag is in effect, what it actually does is removing the "genfiles" path element from the returned path. Given genfiles paths already include repository names in the new path architecture, this suffix is no longer required.

PiperOrigin-RevId: 354122464

src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java

@@ -770,13 +770,12 @@ private static J2ObjcSource protoJ2ObjcSource(
   }
 
   private static PathFragment getProtoOutputRoot(RuleContext ruleContext) {
+    if (ruleContext.getConfiguration().isSiblingRepositoryLayout()) {
+      return ruleContext.getGenfilesFragment();
+    }
     return ruleContext
         .getGenfilesFragment()
-        .getRelative(
-            ruleContext
-                .getLabel()
-                .getRepository()
-                .getExecPath(ruleContext.getConfiguration().isSiblingRepositoryLayout()));
+        .getRelative(ruleContext.getLabel().getRepository().getExecPath(false));
   }
 
   private static boolean isProtoRule(ConfiguredTarget base) {