diff options
Diffstat (limited to 'apex/apex_test.go')
| -rw-r--r-- | apex/apex_test.go | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/apex/apex_test.go b/apex/apex_test.go index 922e40a53..afc395d21 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -4564,7 +4564,7 @@ func TestBootDexJarsFromSourcesAndPrebuilts(t *testing.T) { checkHiddenAPIIndexInputs := func(t *testing.T, ctx *android.TestContext, expectedInputs string) { t.Helper() platformBootclasspath := ctx.ModuleForTests("platform-bootclasspath", "android_common") - indexRule := platformBootclasspath.Rule("platform-bootclasspath-monolithic-hiddenapi-index") + indexRule := platformBootclasspath.Rule("monolithic_hidden_API_index") java.CheckHiddenAPIRuleInputs(t, expectedInputs, indexRule) } @@ -4602,10 +4602,10 @@ func TestBootDexJarsFromSourcesAndPrebuilts(t *testing.T) { checkBootDexJarPath(t, ctx, "libfoo", "out/soong/.intermediates/myapex.deapexer/android_common/deapexer/javalib/libfoo.jar") checkBootDexJarPath(t, ctx, "libbar", "out/soong/.intermediates/myapex.deapexer/android_common/deapexer/javalib/libbar.jar") - // Make sure that the dex file from the prebuilt_apex contributes to the hiddenapi index file. + // Verify the correct module jars contribute to the hiddenapi index file. checkHiddenAPIIndexInputs(t, ctx, ` -.intermediates/libbar/android_common_myapex/hiddenapi/index.csv -.intermediates/libfoo/android_common_myapex/hiddenapi/index.csv +.intermediates/libbar.stubs/android_common/combined/libbar.stubs.jar +.intermediates/libfoo/android_common_myapex/combined/libfoo.jar `) }) @@ -4636,10 +4636,10 @@ func TestBootDexJarsFromSourcesAndPrebuilts(t *testing.T) { checkBootDexJarPath(t, ctx, "libfoo", "out/soong/.intermediates/myapex.deapexer/android_common/deapexer/javalib/libfoo.jar") checkBootDexJarPath(t, ctx, "libbar", "out/soong/.intermediates/myapex.deapexer/android_common/deapexer/javalib/libbar.jar") - // Make sure that the dex file from the apex_set contributes to the hiddenapi index file. + // Verify the correct module jars contribute to the hiddenapi index file. checkHiddenAPIIndexInputs(t, ctx, ` -.intermediates/libbar/android_common_myapex/hiddenapi/index.csv -.intermediates/libfoo/android_common_myapex/hiddenapi/index.csv +.intermediates/libbar.stubs/android_common/combined/libbar.stubs.jar +.intermediates/libfoo/android_common_myapex/combined/libfoo.jar `) }) @@ -4743,10 +4743,10 @@ func TestBootDexJarsFromSourcesAndPrebuilts(t *testing.T) { checkBootDexJarPath(t, ctx, "libfoo", "out/soong/.intermediates/myapex.deapexer/android_common/deapexer/javalib/libfoo.jar") checkBootDexJarPath(t, ctx, "libbar", "out/soong/.intermediates/myapex.deapexer/android_common/deapexer/javalib/libbar.jar") - // Make sure that the dex file from the prebuilt_apex contributes to the hiddenapi index file. + // Verify the correct module jars contribute to the hiddenapi index file. checkHiddenAPIIndexInputs(t, ctx, ` -.intermediates/prebuilt_libbar/android_common_myapex/hiddenapi/index.csv -.intermediates/prebuilt_libfoo/android_common_myapex/hiddenapi/index.csv +.intermediates/prebuilt_libbar.stubs/android_common/combined/libbar.stubs.jar +.intermediates/prebuilt_libfoo/android_common_myapex/combined/libfoo.jar `) }) @@ -4810,10 +4810,10 @@ func TestBootDexJarsFromSourcesAndPrebuilts(t *testing.T) { 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") - // Make sure that the dex file from the prebuilt_apex contributes to the hiddenapi index file. + // Verify the correct module jars contribute to the hiddenapi index file. checkHiddenAPIIndexInputs(t, ctx, ` -.intermediates/libbar/android_common_myapex/hiddenapi/index.csv -.intermediates/libfoo/android_common_apex10000/hiddenapi/index.csv +.intermediates/libbar/android_common_myapex/javac/libbar.jar +.intermediates/libfoo/android_common_apex10000/javac/libfoo.jar `) }) @@ -4879,10 +4879,10 @@ func TestBootDexJarsFromSourcesAndPrebuilts(t *testing.T) { checkBootDexJarPath(t, ctx, "libfoo", "out/soong/.intermediates/myapex.deapexer/android_common/deapexer/javalib/libfoo.jar") checkBootDexJarPath(t, ctx, "libbar", "out/soong/.intermediates/myapex.deapexer/android_common/deapexer/javalib/libbar.jar") - // Make sure that the dex file from the prebuilt_apex contributes to the hiddenapi index file. + // Verify the correct module jars contribute to the hiddenapi index file. checkHiddenAPIIndexInputs(t, ctx, ` -.intermediates/prebuilt_libbar/android_common_myapex/hiddenapi/index.csv -.intermediates/prebuilt_libfoo/android_common_myapex/hiddenapi/index.csv +.intermediates/prebuilt_libbar.stubs/android_common/combined/libbar.stubs.jar +.intermediates/prebuilt_libfoo/android_common_myapex/combined/libfoo.jar `) }) } |