diff options
| author | 2023-11-08 12:07:32 +0000 | |
|---|---|---|
| committer | 2023-11-08 12:07:32 +0000 | |
| commit | 77d4619b1b9c68b39fc9ccb77ef97a198ca47d0a (patch) | |
| tree | 16fe7c0d9d2a646552897c58d563430a9ed22460 /apex/apex_test.go | |
| parent | ab748699a2b3137a2859533e9ab39638f445c4d0 (diff) | |
| parent | 7dbbbd43ba7145b1168f8a955eb38aa4e16ccb47 (diff) | |
Merge "Use the correct mainline BCP jars for app dexpreopt." into main am: 04445d5443 am: f3c1e6f8fe am: 7dbbbd43ba
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2816578
Change-Id: I437d8e0f093fb79778c82507ba2207d3888e994a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'apex/apex_test.go')
| -rw-r--r-- | apex/apex_test.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apex/apex_test.go b/apex/apex_test.go index e6581cf31..ddb9a4051 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -5459,7 +5459,7 @@ func TestBootDexJarsFromSourcesAndPrebuilts(t *testing.T) { checkBootDexJarPath := func(t *testing.T, ctx *android.TestContext, stem string, bootDexJarPath string) { t.Helper() - s := ctx.ModuleForTests("platform-bootclasspath", "android_common") + s := ctx.ModuleForTests("dex_bootjars", "android_common") foundLibfooJar := false base := stem + ".jar" for _, output := range s.AllOutputs() { @@ -5909,8 +5909,8 @@ func TestBootDexJarsFromSourcesAndPrebuilts(t *testing.T) { ` ctx := testDexpreoptWithApexes(t, bp, "", preparer, fragment) - checkBootDexJarPath(t, ctx, "libfoo", "out/soong/.intermediates/libfoo/android_common_apex10000/hiddenapi/libfoo.jar") - checkBootDexJarPath(t, ctx, "libbar", "out/soong/.intermediates/libbar/android_common_myapex/hiddenapi/libbar.jar") + checkBootDexJarPath(t, ctx, "libfoo", "out/soong/.intermediates/my-bootclasspath-fragment/android_common_myapex/hiddenapi-modular/encoded/libfoo.jar") + checkBootDexJarPath(t, ctx, "libbar", "out/soong/.intermediates/my-bootclasspath-fragment/android_common_myapex/hiddenapi-modular/encoded/libbar.jar") // Verify the correct module jars contribute to the hiddenapi index file. checkHiddenAPIIndexFromClassesInputs(t, ctx, ``) |