From e8561c6108e5be1e8cf2fe69881aa9575a064026 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Thu, 30 Nov 2023 17:26:37 -0800 Subject: Include "soong" in sandboxed out paths Previously, the path to built files in the sandbox would be out/.intermediates/... instead of out/soong/.intermediates/.... After this cl, it will be out/soong/.intermediates/.... This makes it more consistent with the non-sandboxed paths, which is easier for developers. CtsApkVerityTestDebugFiles is a genrule that's used to find the paths to other modules. Developers were expected to build it, then copy all the files listed in its output file to a temporary directory. Those paths would be wrong before this change. Bug: 307824623 Test: ./build/soong/tests/genrule_sandbox_test.py CtsApkVerityTestDebugFiles Change-Id: Iadf9e3240a2c828567e46b6b02cc14004f30e8bf --- java/java_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'java/java_test.go') diff --git a/java/java_test.go b/java/java_test.go index 8e83fc412..8b73af0a4 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -2432,7 +2432,7 @@ func TestSdkLibraryProvidesSystemModulesToApiLibrary(t *testing.T) { manifest := m.Output("metalava.sbox.textproto") sboxProto := android.RuleBuilderSboxProtoForTests(t, result.TestContext, manifest) manifestCommand := sboxProto.Commands[0].GetCommand() - classPathFlag := "--classpath __SBOX_SANDBOX_DIR__/out/.intermediates/bar/android_common/turbine-combined/bar.jar" + classPathFlag := "--classpath __SBOX_SANDBOX_DIR__/out/soong/.intermediates/bar/android_common/turbine-combined/bar.jar" android.AssertStringDoesContain(t, "command expected to contain classpath flag", manifestCommand, classPathFlag) } -- cgit v1.2.3-59-g8ed1b