diff options
| -rw-r--r-- | apex/apex_test.go | 36 |
1 files changed, 30 insertions, 6 deletions
diff --git a/apex/apex_test.go b/apex/apex_test.go index 422e46c4d..e1dec2c5b 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -4890,7 +4890,7 @@ func TestBootDexJarsFromSourcesAndPrebuilts(t *testing.T) { } } - checkHiddenAPIIndexInputs := func(t *testing.T, ctx *android.TestContext, expectedIntermediateInputs string) { + checkHiddenAPIIndexFromClassesInputs := func(t *testing.T, ctx *android.TestContext, expectedIntermediateInputs string) { t.Helper() platformBootclasspath := ctx.ModuleForTests("platform-bootclasspath", "android_common") var rule android.TestingBuildParams @@ -4899,6 +4899,15 @@ func TestBootDexJarsFromSourcesAndPrebuilts(t *testing.T) { java.CheckHiddenAPIRuleInputs(t, "intermediate index", expectedIntermediateInputs, rule) } + checkHiddenAPIIndexFromFlagsInputs := func(t *testing.T, ctx *android.TestContext, expectedIntermediateInputs string) { + t.Helper() + platformBootclasspath := ctx.ModuleForTests("platform-bootclasspath", "android_common") + var rule android.TestingBuildParams + + rule = platformBootclasspath.Output("hiddenapi-index.csv") + java.CheckHiddenAPIRuleInputs(t, "monolithic index", expectedIntermediateInputs, rule) + } + fragment := java.ApexVariantReference{ Apex: proptools.StringPtr("myapex"), Module: proptools.StringPtr("my-bootclasspath-fragment"), @@ -4946,10 +4955,13 @@ func TestBootDexJarsFromSourcesAndPrebuilts(t *testing.T) { checkBootDexJarPath(t, ctx, "libbar", "out/soong/.intermediates/myapex.deapexer/android_common/deapexer/javalib/libbar.jar") // Verify the correct module jars contribute to the hiddenapi index file. - checkHiddenAPIIndexInputs(t, ctx, ` + checkHiddenAPIIndexFromClassesInputs(t, ctx, ` out/soong/.intermediates/libbar.stubs/android_common/combined/libbar.stubs.jar out/soong/.intermediates/libfoo/android_common_myapex/combined/libfoo.jar `) + checkHiddenAPIIndexFromFlagsInputs(t, ctx, ` + out/soong/.intermediates/frameworks/base/boot/platform-bootclasspath/android_common/hiddenapi-monolithic/index-from-classes.csv + `) }) t.Run("apex_set only", func(t *testing.T) { @@ -4987,10 +4999,13 @@ func TestBootDexJarsFromSourcesAndPrebuilts(t *testing.T) { checkBootDexJarPath(t, ctx, "libbar", "out/soong/.intermediates/myapex.deapexer/android_common/deapexer/javalib/libbar.jar") // Verify the correct module jars contribute to the hiddenapi index file. - checkHiddenAPIIndexInputs(t, ctx, ` + checkHiddenAPIIndexFromClassesInputs(t, ctx, ` out/soong/.intermediates/libbar.stubs/android_common/combined/libbar.stubs.jar out/soong/.intermediates/libfoo/android_common_myapex/combined/libfoo.jar `) + checkHiddenAPIIndexFromFlagsInputs(t, ctx, ` + out/soong/.intermediates/frameworks/base/boot/platform-bootclasspath/android_common/hiddenapi-monolithic/index-from-classes.csv + `) }) t.Run("prebuilt with source library preferred", func(t *testing.T) { @@ -5108,10 +5123,13 @@ func TestBootDexJarsFromSourcesAndPrebuilts(t *testing.T) { checkBootDexJarPath(t, ctx, "libbar", "out/soong/.intermediates/myapex.deapexer/android_common/deapexer/javalib/libbar.jar") // Verify the correct module jars contribute to the hiddenapi index file. - checkHiddenAPIIndexInputs(t, ctx, ` + checkHiddenAPIIndexFromClassesInputs(t, ctx, ` out/soong/.intermediates/prebuilt_libbar.stubs/android_common/combined/libbar.stubs.jar out/soong/.intermediates/prebuilt_libfoo/android_common_myapex/combined/libfoo.jar `) + checkHiddenAPIIndexFromFlagsInputs(t, ctx, ` + out/soong/.intermediates/frameworks/base/boot/platform-bootclasspath/android_common/hiddenapi-monolithic/index-from-classes.csv + `) }) t.Run("prebuilt with source apex preferred", func(t *testing.T) { @@ -5182,10 +5200,13 @@ func TestBootDexJarsFromSourcesAndPrebuilts(t *testing.T) { checkBootDexJarPath(t, ctx, "libbar", "out/soong/.intermediates/libbar/android_common_myapex/hiddenapi/libbar.jar") // Verify the correct module jars contribute to the hiddenapi index file. - checkHiddenAPIIndexInputs(t, ctx, ` + checkHiddenAPIIndexFromClassesInputs(t, ctx, ` out/soong/.intermediates/libbar/android_common_myapex/javac/libbar.jar out/soong/.intermediates/libfoo/android_common_apex10000/javac/libfoo.jar `) + checkHiddenAPIIndexFromFlagsInputs(t, ctx, ` + out/soong/.intermediates/frameworks/base/boot/platform-bootclasspath/android_common/hiddenapi-monolithic/index-from-classes.csv + `) }) t.Run("prebuilt preferred with source apex disabled", func(t *testing.T) { @@ -5258,10 +5279,13 @@ func TestBootDexJarsFromSourcesAndPrebuilts(t *testing.T) { checkBootDexJarPath(t, ctx, "libbar", "out/soong/.intermediates/myapex.deapexer/android_common/deapexer/javalib/libbar.jar") // Verify the correct module jars contribute to the hiddenapi index file. - checkHiddenAPIIndexInputs(t, ctx, ` + checkHiddenAPIIndexFromClassesInputs(t, ctx, ` out/soong/.intermediates/prebuilt_libbar.stubs/android_common/combined/libbar.stubs.jar out/soong/.intermediates/prebuilt_libfoo/android_common_myapex/combined/libfoo.jar `) + checkHiddenAPIIndexFromFlagsInputs(t, ctx, ` + out/soong/.intermediates/frameworks/base/boot/platform-bootclasspath/android_common/hiddenapi-monolithic/index-from-classes.csv + `) }) } |