diff options
| author | Cole Faust <colefaust@google.com> | 2023-12-20 01:35:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-12-20 01:35:40 +0000 |
| commit | 30e32f67fc746f3d8ca0b43e5dec06a102a2eaec (patch) | |
| tree | 187d884b20d586ec3ac880832c01ced6aaa458df /java/java_test.go | |
| parent | a4cca85eeabdb2f7e35f447936c449a345428d5a (diff) | |
| parent | 81f2ac35f127f832d2fae0cca9d3a88a88b9305a (diff) | |
Merge changes I8b352305,Iadf9e324 into main
* changes:
Sandbox CtsApkVerityTestDebugFiles
Include "soong" in sandboxed out paths
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/java_test.go b/java/java_test.go index 2368b6cfe..b9dc453b3 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -2431,7 +2431,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) } |