Flip default value of --experimental_shortened_obj_file_path to true

RELNOTES:
Flip default value of --experimental_shortened_obj_file_path to true, Bazel now generates short object file path by default.
PiperOrigin-RevId: 191958480

9 files changed, 88 insertions, 104 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/AnalysisCachingTest.java b/src/test/java/com/google/devtools/build/lib/analysis/AnalysisCachingTest.java
index 39f5fdce81..5031184a5d 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/AnalysisCachingTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/AnalysisCachingTest.java
@@ -139,13 +139,14 @@ public class AnalysisCachingTest extends AnalysisCachingTestBase {
       return;
     }
     useConfiguration("--cpu=k8");
-    scratch.file("conflict/BUILD",
+    scratch.file(
+        "conflict/BUILD",
         "cc_library(name='x', srcs=['foo.cc'])",
-        "cc_binary(name='_objs/x/conflict/foo.pic.o', srcs=['bar.cc'])",
-        "cc_binary(name='foo', deps=['x'], data=['_objs/x/conflict/foo.pic.o'])");
+        "cc_binary(name='_objs/x/foo.pic.o', srcs=['bar.cc'])",
+        "cc_binary(name='foo', deps=['x'], data=['_objs/x/foo.pic.o'])");
     reporter.removeHandler(failFastHandler); // expect errors
     update(defaultFlags().with(Flag.KEEP_GOING), "//conflict:foo");
-    assertContainsEvent("file 'conflict/_objs/x/conflict/foo.pic.o' " + CONFLICT_MSG);
+    assertContainsEvent("file 'conflict/_objs/x/foo.pic.o' " + CONFLICT_MSG);
     assertThat(getAnalysisResult().getTargetsToBuild()).isEmpty();
   }
 
@@ -161,22 +162,23 @@ public class AnalysisCachingTest extends AnalysisCachingTestBase {
   @Test
   public void testNoActionConflictWithInvalidatedTarget() throws Exception {
     useConfiguration("--cpu=k8");
-    scratch.file("conflict/BUILD",
+    scratch.file(
+        "conflict/BUILD",
         "cc_library(name='x', srcs=['foo.cc'])",
-        "cc_binary(name='_objs/x/conflict/foo.o', srcs=['bar.cc'])");
+        "cc_binary(name='_objs/x/foo.o', srcs=['bar.cc'])");
     update("//conflict:x");
     ConfiguredTarget conflict = getConfiguredTarget("//conflict:x");
-    Action oldAction = getGeneratingAction(getBinArtifact("_objs/x/conflict/foo.pic.o", conflict));
+    Action oldAction = getGeneratingAction(getBinArtifact("_objs/x/foo.pic.o", conflict));
     assertThat(oldAction.getOwner().getLabel().toString()).isEqualTo("//conflict:x");
-    scratch.overwriteFile("conflict/BUILD",
+    scratch.overwriteFile(
+        "conflict/BUILD",
         "cc_library(name='newx', srcs=['foo.cc'])", // Rename target.
-        "cc_binary(name='_objs/x/conflict/foo.pic.o', srcs=['bar.cc'])");
-    update(defaultFlags(), "//conflict:_objs/x/conflict/foo.pic.o");
-    ConfiguredTarget objsConflict = getConfiguredTarget("//conflict:_objs/x/conflict/foo.pic.o");
-    Action newAction =
-        getGeneratingAction(getBinArtifact("_objs/x/conflict/foo.pic.o", objsConflict));
+        "cc_binary(name='_objs/x/foo.pic.o', srcs=['bar.cc'])");
+    update(defaultFlags(), "//conflict:_objs/x/foo.pic.o");
+    ConfiguredTarget objsConflict = getConfiguredTarget("//conflict:_objs/x/foo.pic.o");
+    Action newAction = getGeneratingAction(getBinArtifact("_objs/x/foo.pic.o", objsConflict));
     assertThat(newAction.getOwner().getLabel().toString())
-        .isEqualTo("//conflict:_objs/x/conflict/foo.pic.o");
+        .isEqualTo("//conflict:_objs/x/foo.pic.o");
   }
 
   /**
@@ -189,13 +191,13 @@ public class AnalysisCachingTest extends AnalysisCachingTestBase {
       return;
     }
     useConfiguration("--cpu=k8");
-    scratch.file("conflict/BUILD",
+    scratch.file(
+        "conflict/BUILD",
         "cc_library(name='x', srcs=['foo.cc'])",
-        "cc_binary(name='_objs/x/conflict/foo.pic.o', srcs=['bar.cc'])");
+        "cc_binary(name='_objs/x/foo.pic.o', srcs=['bar.cc'])");
     reporter.removeHandler(failFastHandler); // expect errors
-    update(defaultFlags().with(Flag.KEEP_GOING),
-        "//conflict:x", "//conflict:_objs/x/conflict/foo.pic.o");
-    assertContainsEvent("file 'conflict/_objs/x/conflict/foo.pic.o' " + CONFLICT_MSG);
+    update(defaultFlags().with(Flag.KEEP_GOING), "//conflict:x", "//conflict:_objs/x/foo.pic.o");
+    assertContainsEvent("file 'conflict/_objs/x/foo.pic.o' " + CONFLICT_MSG);
   }
 
   @Test
@@ -205,23 +207,23 @@ public class AnalysisCachingTest extends AnalysisCachingTestBase {
       return;
     }
     useConfiguration("--cpu=k8");
-    scratch.file("conflict/BUILD",
-                "cc_library(name='x', srcs=['foo.cc'])",
-                "cc_binary(name='_objs/x/conflict/foo.pic.o', srcs=['bar.cc'])");
+    scratch.file(
+        "conflict/BUILD",
+        "cc_library(name='x', srcs=['foo.cc'])",
+        "cc_binary(name='_objs/x/foo.pic.o', srcs=['bar.cc'])");
     reporter.removeHandler(failFastHandler); // expect errors
-    update(defaultFlags().with(Flag.KEEP_GOING),
-        "//conflict:x", "//conflict:_objs/x/conflict/foo.pic.o");
+    update(defaultFlags().with(Flag.KEEP_GOING), "//conflict:x", "//conflict:_objs/x/foo.pic.o");
     // We want to force a "dropConfiguredTargetsNow" operation, which won't inform the
     // invalidation receiver about the dropped configured targets.
     skyframeExecutor.clearAnalysisCache(
         ImmutableList.<ConfiguredTarget>of(), ImmutableSet.<AspectValue>of());
-    assertContainsEvent("file 'conflict/_objs/x/conflict/foo.pic.o' " + CONFLICT_MSG);
+    assertContainsEvent("file 'conflict/_objs/x/foo.pic.o' " + CONFLICT_MSG);
     eventCollector.clear();
-    scratch.overwriteFile("conflict/BUILD",
+    scratch.overwriteFile(
+        "conflict/BUILD",
         "cc_library(name='x', srcs=['baz.cc'])",
-        "cc_binary(name='_objs/x/conflict/foo.pic.o', srcs=['bar.cc'])");
-    update(defaultFlags().with(Flag.KEEP_GOING),
-        "//conflict:x", "//conflict:_objs/x/conflict/foo.pic.o");
+        "cc_binary(name='_objs/x/foo.pic.o', srcs=['bar.cc'])");
+    update(defaultFlags().with(Flag.KEEP_GOING), "//conflict:x", "//conflict:_objs/x/foo.pic.o");
     assertNoEvents();
   }
   
@@ -239,14 +241,11 @@ public class AnalysisCachingTest extends AnalysisCachingTestBase {
     scratch.file(
         "conflict/BUILD",
         "cc_library(name='x', srcs=['foo.cc'])",
-        "cc_binary(name='_objs/x/conflict/foo.pic.o', srcs=['bar.cc'])");
+        "cc_binary(name='_objs/x/foo.pic.o', srcs=['bar.cc'])");
     reporter.removeHandler(failFastHandler); // expect errors
-    update(
-        defaultFlags().with(Flag.KEEP_GOING),
-        "//conflict:x",
-        "//conflict:_objs/x/conflict/foo.pic.o");
+    update(defaultFlags().with(Flag.KEEP_GOING), "//conflict:x", "//conflict:_objs/x/foo.pic.o");
 
-    assertContainsEvent("file 'conflict/_objs/x/conflict/foo.pic.o' " + CONFLICT_MSG);
+    assertContainsEvent("file 'conflict/_objs/x/foo.pic.o' " + CONFLICT_MSG);
     assertDoesNotContainEvent("MandatoryInputs");
     assertDoesNotContainEvent("Outputs");
   }
@@ -266,13 +265,12 @@ public class AnalysisCachingTest extends AnalysisCachingTestBase {
         "conflict/BUILD",
         "cc_library(name='x', srcs=['foo1.cc', 'foo2.cc', 'foo3.cc', 'foo4.cc', 'foo5.cc'"
             + ", 'foo6.cc'])",
-        "genrule(name = 'foo', outs=['_objs/x/conflict/foo1.pic.o'], srcs=['foo1.cc', 'foo2.cc', "
+        "genrule(name = 'foo', outs=['_objs/x/foo1.pic.o'], srcs=['foo1.cc', 'foo2.cc', "
             + "'foo3.cc', 'foo4.cc', 'foo5.cc', 'foo6.cc'], cmd='', output_to_bindir=1)");
     reporter.removeHandler(failFastHandler); // expect errors
     update(defaultFlags().with(Flag.KEEP_GOING), "//conflict:x", "//conflict:foo");
 
-    Event event =
-        assertContainsEvent("file 'conflict/_objs/x/conflict/foo1.pic.o' " + CONFLICT_MSG);
+    Event event = assertContainsEvent("file 'conflict/_objs/x/foo1.pic.o' " + CONFLICT_MSG);
     assertContainsEvent("MandatoryInputs");
     assertContainsEvent("Outputs");
 
@@ -298,14 +296,14 @@ public class AnalysisCachingTest extends AnalysisCachingTestBase {
       return;
     }
     useConfiguration("--cpu=k8");
-    scratch.file("conflict/BUILD",
+    scratch.file(
+        "conflict/BUILD",
         "cc_library(name='x', srcs=['foo.cc'])",
-        "cc_binary(name='_objs/x/conflict/foo.o', srcs=['bar.cc'])");
+        "cc_binary(name='_objs/x/foo.o', srcs=['bar.cc'])");
     reporter.removeHandler(failFastHandler); // expect errors
-    update(defaultFlags().with(Flag.KEEP_GOING),
-        "//conflict:x", "//conflict:_objs/x/conflict/foo.pic.o");
+    update(defaultFlags().with(Flag.KEEP_GOING), "//conflict:x", "//conflict:_objs/x/foo.pic.o");
     ConfiguredTarget a = getConfiguredTarget("//conflict:x");
-    ConfiguredTarget b = getConfiguredTarget("//conflict:_objs/x/conflict/foo.pic.o");
+    ConfiguredTarget b = getConfiguredTarget("//conflict:_objs/x/foo.pic.o");
     assertThat(hasTopLevelAnalysisError(a) ^ hasTopLevelAnalysisError(b)).isTrue();
   }
 
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java b/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java
index 90bc03bb9f..92a90c556f 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java
@@ -928,18 +928,18 @@ public class BuildViewTest extends BuildViewTestBase {
     }
     useConfiguration("--cpu=k8");
     reporter.removeHandler(failFastHandler); // Expect errors from action conflicts.
-    scratch.file("conflict/BUILD",
+    scratch.file(
+        "conflict/BUILD",
         "config_setting(name = 'a', values = {'test_arg': 'a'})",
         "cc_library(name='x', srcs=select({':a': ['a.cc'], '//conditions:default': ['foo.cc']}))",
-        "cc_binary(name='_objs/x/conflict/foo.pic.o', srcs=['bar.cc'])");
-    AnalysisResult result = update(
-        defaultFlags().with(Flag.KEEP_GOING),
-        "//conflict:_objs/x/conflict/foo.pic.o",
-        "//conflict:x");
+        "cc_binary(name='_objs/x/foo.pic.o', srcs=['bar.cc'])");
+    AnalysisResult result =
+        update(
+            defaultFlags().with(Flag.KEEP_GOING), "//conflict:_objs/x/foo.pic.o", "//conflict:x");
     assertThat(result.hasError()).isTrue();
     // Expect to reach this line without a Precondition-triggered NullPointerException.
     assertContainsEvent(
-        "file 'conflict/_objs/x/conflict/foo.pic.o' is generated by these conflicting actions");
+        "file 'conflict/_objs/x/foo.pic.o' is generated by these conflicting actions");
   }
 
   @Test
diff --git a/src/test/java/com/google/devtools/build/lib/rules/ToolchainTypeTest.java b/src/test/java/com/google/devtools/build/lib/rules/ToolchainTypeTest.java
index 70fe4e0ee5..25b338d6c7 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/ToolchainTypeTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/ToolchainTypeTest.java
@@ -124,7 +124,7 @@ public class ToolchainTypeTest extends BuildViewTestCase {
             .setList("copts", "foobar$(TARGET_CPU)")
             .write();
     CppCompileAction compileAction =
-        (CppCompileAction) getGeneratingAction(getBinArtifact("_objs/cclib/cclib/a.o", cclibrary));
+        (CppCompileAction) getGeneratingAction(getBinArtifact("_objs/cclib/a.o", cclibrary));
     assertThat(compileAction.getArguments()).contains("foobarpiii");
 
     ConfiguredTarget ccbinary =
@@ -133,7 +133,7 @@ public class ToolchainTypeTest extends BuildViewTestCase {
             .setList("copts", "foobar$(TARGET_CPU)")
             .write();
     compileAction =
-        (CppCompileAction) getGeneratingAction(getBinArtifact("_objs/ccbin/ccbin/a.o", ccbinary));
+        (CppCompileAction) getGeneratingAction(getBinArtifact("_objs/ccbin/a.o", ccbinary));
     assertThat(compileAction.getArguments()).contains("foobarpiii");
 
     ConfiguredTarget cctest =
@@ -142,7 +142,7 @@ public class ToolchainTypeTest extends BuildViewTestCase {
             .setList("copts", "foobar$(TARGET_CPU)")
             .write();
     compileAction =
-        (CppCompileAction) getGeneratingAction(getBinArtifact("_objs/cctest/cctest/a.o", cctest));
+        (CppCompileAction) getGeneratingAction(getBinArtifact("_objs/cctest/a.o", cctest));
     assertThat(compileAction.getArguments()).contains("foobarpiii");
   }
 }
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java
index c10d2c4e91..85ae2d6360 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java
@@ -401,17 +401,15 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase {
     useConfiguration("--cpu=k8");
     // ArtifactsToAlwaysBuild should apply both for static libraries.
     ConfiguredTarget helloStatic = getConfiguredTarget("//hello:hello_static");
-    assertThat(
-        artifactsToStrings(getOutputGroup(helloStatic, OutputGroupInfo.HIDDEN_TOP_LEVEL)))
-        .containsExactly("bin hello/_objs/hello_static/hello/hello.pic.o");
+    assertThat(artifactsToStrings(getOutputGroup(helloStatic, OutputGroupInfo.HIDDEN_TOP_LEVEL)))
+        .containsExactly("bin hello/_objs/hello_static/hello.pic.o");
     Artifact implSharedObject = getBinArtifact("libhello_static.so", helloStatic);
     assertThat(getFilesToBuild(helloStatic)).doesNotContain(implSharedObject);
 
     // And for shared libraries.
     ConfiguredTarget hello = getConfiguredTarget("//hello:hello");
-    assertThat(
-        artifactsToStrings(getOutputGroup(helloStatic, OutputGroupInfo.HIDDEN_TOP_LEVEL)))
-        .containsExactly("bin hello/_objs/hello_static/hello/hello.pic.o");
+    assertThat(artifactsToStrings(getOutputGroup(helloStatic, OutputGroupInfo.HIDDEN_TOP_LEVEL)))
+        .containsExactly("bin hello/_objs/hello_static/hello.pic.o");
     implSharedObject = getBinArtifact("libhello.so", hello);
     assertThat(getFilesToBuild(hello)).contains(implSharedObject);
   }
@@ -426,9 +424,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase {
         "cc_library(name = 'z', srcs = ['z.cc'])");
     assertThat(artifactsToStrings(getOutputGroup(x, OutputGroupInfo.HIDDEN_TOP_LEVEL)))
         .containsExactly(
-            "bin foo/_objs/x/foo/x.pic.o",
-            "bin foo/_objs/y/foo/y.pic.o",
-            "bin foo/_objs/z/foo/z.pic.o");
+            "bin foo/_objs/x/x.pic.o", "bin foo/_objs/y/y.pic.o", "bin foo/_objs/z/z.pic.o");
   }
 
   @Test
@@ -557,7 +553,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase {
         "    textual_hdrs = ['t.h'],",
         ")");
     getConfiguredTarget("//module:b");
-    Artifact bModuleArtifact = getBinArtifact("_objs/b/module/b.pic.pcm", "//module:b");
+    Artifact bModuleArtifact = getBinArtifact("_objs/b/b.pic.pcm", "//module:b");
     CppCompileAction bModuleAction = (CppCompileAction) getGeneratingAction(bModuleArtifact);
     assertThat(bModuleAction.getIncludeScannerSources()).containsExactly(
         getSourceArtifact("module/b.h"), getSourceArtifact("module/t.h"));
@@ -565,12 +561,12 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase {
         getGenfilesArtifactWithNoOwner("module/b.cppmap"));
 
     getConfiguredTarget("//module:a");
-    Artifact aObjectArtifact = getBinArtifact("_objs/a/module/a.pic.o", "//module:a");
+    Artifact aObjectArtifact = getBinArtifact("_objs/a/a.pic.o", "//module:a");
     CppCompileAction aObjectAction = (CppCompileAction) getGeneratingAction(aObjectArtifact);
     assertThat(aObjectAction.getIncludeScannerSources()).containsExactly(
         getSourceArtifact("module/a.cc"));
     assertThat(aObjectAction.getCcCompilationContextInfo().getTransitiveModules(true))
-        .contains(getBinArtifact("_objs/b/module/b.pic.pcm", "//module:b"));
+        .contains(getBinArtifact("_objs/b/b.pic.pcm", "//module:b"));
     assertThat(aObjectAction.getInputs()).contains(
         getGenfilesArtifactWithNoOwner("module/b.cppmap"));
     assertNoEvents();
@@ -709,9 +705,8 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase {
 
     // The //nomodule:f target only depends on non-module targets, thus it should be module-free.
     getConfiguredTarget("//nomodule:f");
-    assertThat(getGeneratingAction(getBinArtifact("_objs/f/nomodule/f.pic.pcm", "//nomodule:f")))
-        .isNull();
-    Artifact fObjectArtifact = getBinArtifact("_objs/f/nomodule/f.pic.o", "//nomodule:f");
+    assertThat(getGeneratingAction(getBinArtifact("_objs/f/f.pic.pcm", "//nomodule:f"))).isNull();
+    Artifact fObjectArtifact = getBinArtifact("_objs/f/f.pic.o", "//nomodule:f");
     CppCompileAction fObjectAction = (CppCompileAction) getGeneratingAction(fObjectArtifact);
     // Only the module map of f itself itself and the direct dependencies are needed.
     assertThat(getNonSystemModuleMaps(fObjectAction.getInputs())).containsExactly(
@@ -725,9 +720,8 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase {
     // The //nomodule:c target will get the header module for //module:b, which is a direct
     // dependency.
     getConfiguredTarget("//nomodule:c");
-    assertThat(getGeneratingAction(getBinArtifact("_objs/c/nomodule/c.pic.pcm", "//nomodule:c")))
-        .isNull();
-    Artifact cObjectArtifact = getBinArtifact("_objs/c/nomodule/c.pic.o", "//nomodule:c");
+    assertThat(getGeneratingAction(getBinArtifact("_objs/c/c.pic.pcm", "//nomodule:c"))).isNull();
+    Artifact cObjectArtifact = getBinArtifact("_objs/c/c.pic.o", "//nomodule:c");
     CppCompileAction cObjectAction = (CppCompileAction) getGeneratingAction(cObjectArtifact);
     assertThat(getNonSystemModuleMaps(cObjectAction.getInputs())).containsExactly(
         getGenfilesArtifact("b.cppmap", "//module:b"),
@@ -743,9 +737,8 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase {
 
     // The //nomodule:d target depends on //module:b via one indirection (//nomodule:c).
     getConfiguredTarget("//nomodule:d");
-    assertThat(getGeneratingAction(getBinArtifact("_objs/d/nomodule/d.pic.pcm", "//nomodule:d")))
-        .isNull();
-    Artifact dObjectArtifact = getBinArtifact("_objs/d/nomodule/d.pic.o", "//nomodule:d");
+    assertThat(getGeneratingAction(getBinArtifact("_objs/d/d.pic.pcm", "//nomodule:d"))).isNull();
+    Artifact dObjectArtifact = getBinArtifact("_objs/d/d.pic.o", "//nomodule:d");
     CppCompileAction dObjectAction = (CppCompileAction) getGeneratingAction(dObjectArtifact);
     // Module map 'c.cppmap' is needed because it is a direct dependency.
     assertThat(getNonSystemModuleMaps(dObjectAction.getInputs())).containsExactly(
@@ -759,14 +752,14 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase {
     // The //module:j target depends on //module:g via //nomodule:h and on //module:b via
     // both //module:g and //nomodule:c.
     getConfiguredTarget("//module:j");
-    Artifact jObjectArtifact = getBinArtifact("_objs/j/module/j.pic.o", "//module:j");
+    Artifact jObjectArtifact = getBinArtifact("_objs/j/j.pic.o", "//module:j");
     CppCompileAction jObjectAction = (CppCompileAction) getGeneratingAction(jObjectArtifact);
     assertThat(
             getHeaderModules(
                 jObjectAction.getCcCompilationContextInfo().getTransitiveModules(true)))
         .containsExactly(
-            getBinArtifact("_objs/b/module/b.pic.pcm", "//module:b"),
-            getBinArtifact("_objs/g/module/g.pic.pcm", "//module:g"));
+            getBinArtifact("_objs/b/b.pic.pcm", "//module:b"),
+            getBinArtifact("_objs/g/g.pic.pcm", "//module:g"));
     assertThat(jObjectAction.getIncludeScannerSources()).containsExactly(
         getSourceArtifact("module/j.cc"));
     assertThat(jObjectAction.getMainIncludeScannerSource()).isEqualTo(
@@ -775,8 +768,8 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase {
             getHeaderModules(
                 jObjectAction.getCcCompilationContextInfo().getTransitiveModules(true)))
         .containsExactly(
-            getBinArtifact("_objs/b/module/b.pic.pcm", "//module:b"),
-            getBinArtifact("_objs/g/module/g.pic.pcm", "//module:g"));
+            getBinArtifact("_objs/b/b.pic.pcm", "//module:b"),
+            getBinArtifact("_objs/g/g.pic.pcm", "//module:g"));
   }
 
   @Test
@@ -788,7 +781,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase {
     setupPackagesForModuleTests( /*useHeaderModules=*/true);
 
     getConfiguredTarget("//nomodule:f");
-    Artifact fObjectArtifact = getBinArtifact("_objs/f/nomodule/f.pic.o", "//nomodule:f");
+    Artifact fObjectArtifact = getBinArtifact("_objs/f/f.pic.o", "//nomodule:f");
     CppCompileAction fObjectAction = (CppCompileAction) getGeneratingAction(fObjectArtifact);
     // Only the module map of f itself itself and the direct dependencies are needed.
     assertThat(getNonSystemModuleMaps(fObjectAction.getInputs()))
@@ -797,7 +790,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase {
             getGenfilesArtifact("e.cppmap", "//nomodule:e"));
 
     getConfiguredTarget("//nomodule:c");
-    Artifact cObjectArtifact = getBinArtifact("_objs/c/nomodule/c.pic.o", "//nomodule:c");
+    Artifact cObjectArtifact = getBinArtifact("_objs/c/c.pic.o", "//nomodule:c");
     CppCompileAction cObjectAction = (CppCompileAction) getGeneratingAction(cObjectArtifact);
     assertThat(getNonSystemModuleMaps(cObjectAction.getInputs()))
         .containsExactly(
@@ -806,10 +799,10 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase {
     assertThat(
             getHeaderModules(
                 cObjectAction.getCcCompilationContextInfo().getTransitiveModules(true)))
-        .containsExactly(getBinArtifact("_objs/b/module/b.pic.pcm", "//module:b"));
+        .containsExactly(getBinArtifact("_objs/b/b.pic.pcm", "//module:b"));
 
     getConfiguredTarget("//nomodule:d");
-    Artifact dObjectArtifact = getBinArtifact("_objs/d/nomodule/d.pic.o", "//nomodule:d");
+    Artifact dObjectArtifact = getBinArtifact("_objs/d/d.pic.o", "//nomodule:d");
     CppCompileAction dObjectAction = (CppCompileAction) getGeneratingAction(dObjectArtifact);
     assertThat(getNonSystemModuleMaps(dObjectAction.getInputs()))
         .containsExactly(
@@ -818,7 +811,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase {
     assertThat(
             getHeaderModules(
                 dObjectAction.getCcCompilationContextInfo().getTransitiveModules(true)))
-        .containsExactly(getBinArtifact("_objs/b/module/b.pic.pcm", "//module:b"));
+        .containsExactly(getBinArtifact("_objs/b/b.pic.pcm", "//module:b"));
   }
 
   private void writeSimpleCcLibrary() throws Exception {
@@ -931,7 +924,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase {
     useConfiguration("--features=parse_headers");
     ConfiguredTarget x =
         scratchConfiguredTarget("x", "x", "cc_library(name = 'x', hdrs = ['x.cc'])");
-    assertThat(getGeneratingAction(getBinArtifact("_objs/x/x/x.pic.o", x))).isNull();
+    assertThat(getGeneratingAction(getBinArtifact("_objs/x/.pic.o", x))).isNull();
   }
 
   @Test
@@ -1093,7 +1086,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase {
     useConfiguration(flags);
     scratch.overwriteFile("mode/BUILD", "cc_library(name = 'a', srcs = ['a.cc'])");
     getConfiguredTarget("//mode:a");
-    Artifact objectArtifact = getBinArtifact("_objs/a/mode/a.pic.o", "//mode:a");
+    Artifact objectArtifact = getBinArtifact("_objs/a/a.pic.o", "//mode:a");
     CppCompileAction action = (CppCompileAction) getGeneratingAction(objectArtifact);
     return action.getCompilerOptions();
   }
@@ -1128,10 +1121,10 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase {
     String objectPath;
     if (useHost) {
       target = getHostConfiguredTarget("//mode:a");
-      objectPath = "_objs/a/mode/a.o";
+      objectPath = "_objs/a/a.o";
     } else {
       target = getConfiguredTarget("//mode:a");
-      objectPath = "_objs/a/mode/a.pic.o";
+      objectPath = "_objs/a/a.pic.o";
     }
     Artifact objectArtifact = getBinArtifact(objectPath, target);
     CppCompileAction action = (CppCompileAction) getGeneratingAction(objectArtifact);
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CompileBuildVariablesTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CompileBuildVariablesTest.java
index 2714ef51c9..153c4ed4c7 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CompileBuildVariablesTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CompileBuildVariablesTest.java
@@ -62,7 +62,7 @@ public class CompileBuildVariablesTest extends BuildViewTestCase {
     assertThat(variables.getStringVariable(CompileBuildVariables.SOURCE_FILE.getVariableName()))
         .contains("x/bin.cc");
     assertThat(variables.getStringVariable(CompileBuildVariables.OUTPUT_FILE.getVariableName()))
-        .contains("x/bin");
+        .contains("_objs/bin/bin");
   }
 
   @Test
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java
index beb473470b..556a15690e 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java
@@ -253,7 +253,7 @@ public class CppLinkActionTest extends BuildViewTestCase {
 
     configuredTarget = getConfiguredTarget("//x:b");
     linkAction = (CppLinkAction) getGeneratingAction(configuredTarget, "x/b" + extension);
-    assertThat(artifactsToStrings(linkAction.getInputs())).contains("bin x/_objs/b/x/a.pic.o");
+    assertThat(artifactsToStrings(linkAction.getInputs())).contains("bin x/_objs/b/a.pic.o");
     runfilesProvider = configuredTarget.getProvider(RunfilesProvider.class);
     assertThat(artifactsToStrings(runfilesProvider.getDefaultRunfiles().getArtifacts()))
         .containsExactly("bin x/b");
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcLibraryTest.java
index 2e96850a9b..7417def1e5 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcLibraryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcLibraryTest.java
@@ -999,9 +999,7 @@ public class BazelJ2ObjcLibraryTest extends J2ObjcLibraryTest {
 
     assertThat(objectFilesFromGenJar.isTreeArtifact()).isTrue();
     assertThat(objectFilesFromGenJar.getRootRelativePathString())
-        .isEqualTo(
-            "java/com/google/app/test/_objs/test/java/com/google/app/test/_j2objc/"
-                + "src_jar_files/test/source_files");
+        .isEqualTo("java/com/google/app/test/_objs/test/non_arc/source_files");
 
     ActionAnalysisMetadata actionTemplate =
         getActionGraph().getGeneratingAction(objectFilesFromGenJar);
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java
index 8226bc1bc8..3f6279e907 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java
@@ -119,7 +119,7 @@ public class ObjcLibraryTest extends ObjcRuleTestCase {
     assertThat(Artifact.toRootRelativePaths(compileA.getPossibleInputsForTesting()))
         .containsAllOf("objc/a.m", "objc/hdr.h", "objc/private.h");
     assertThat(Artifact.toRootRelativePaths(compileA.getOutputs()))
-        .containsExactly("objc/_objs/x/objc/a.o", "objc/_objs/x/objc/a.d");
+        .containsExactly("objc/_objs/x/arc/a.o", "objc/_objs/x/arc/a.d");
   }
 
   @Test
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java
index 218f1009f2..abe96c3165 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java
@@ -737,14 +737,10 @@ public abstract class ObjcRuleTestCase extends BuildViewTestCase {
     Artifact protoHeaderC = getBinArtifact("_generated_protos/x/protos/DataC.pbobjc.h", topTarget);
     Artifact protoHeaderD = getBinArtifact("_generated_protos/x/protos/DataD.pbobjc.h", topTarget);
 
-    Artifact protoObjectA =
-        getBinArtifact("_objs/x/x/_generated_protos/x/protos/DataA.pbobjc.o", topTarget);
-    Artifact protoObjectB =
-        getBinArtifact("_objs/x/x/_generated_protos/x/protos/DataB.pbobjc.o", topTarget);
-    Artifact protoObjectC =
-        getBinArtifact("_objs/x/x/_generated_protos/x/protos/DataC.pbobjc.o", topTarget);
-    Artifact protoObjectD =
-        getBinArtifact("_objs/x/x/_generated_protos/x/protos/DataD.pbobjc.o", topTarget);
+    Artifact protoObjectA = getBinArtifact("_objs/x/non_arc/DataA.pbobjc.o", topTarget);
+    Artifact protoObjectB = getBinArtifact("_objs/x/non_arc/DataB.pbobjc.o", topTarget);
+    Artifact protoObjectC = getBinArtifact("_objs/x/non_arc/DataC.pbobjc.o", topTarget);
+    Artifact protoObjectD = getBinArtifact("_objs/x/non_arc/DataD.pbobjc.o", topTarget);
 
     CommandAction protoObjectActionA = (CommandAction) getGeneratingAction(protoObjectA);
     CommandAction protoObjectActionB = (CommandAction) getGeneratingAction(protoObjectB);
@@ -770,8 +766,7 @@ public abstract class ObjcRuleTestCase extends BuildViewTestCase {
 
   private void assertCoptsAndDefinesNotPropagatedToProtos(ConfiguredTarget topTarget)
       throws Exception {
-    Artifact protoObject =
-        getBinArtifact("_objs/x/x/_generated_protos/x/protos/DataA.pbobjc.o", topTarget);
+    Artifact protoObject = getBinArtifact("_objs/x/non_arc/DataA.pbobjc.o", topTarget);
     CommandAction protoObjectAction = (CommandAction) getGeneratingAction(protoObject);
     assertThat(protoObjectAction).isNotNull();
     assertThat(protoObjectAction.getArguments())