StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make CheckHiddenAPIRuleInputs more reusable

Browse Source 
Adds a message parameter and allows leading spaces in the expected file
string to allow them to be nicely indented.

Bug: 177892522
Test: m nothing
Merged-In: I33df26610738c48879fa0b8250dc377dd04bb07d
Change-Id: I33df26610738c48879fa0b8250dc377dd04bb07d
(cherry picked from commit 51d7da2c4e)
This commit is contained in:
Paul Duffin
2021-06-16 02:04:13 +01:00
parent 3ae9e2cef5
commit 4c2f78bff4
3 changed files with 34 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
apex/apex_test.go
View File

@@ -4420,7 +4420,7 @@ func TestBootDexJarsFromSourcesAndPrebuilts(t *testing.T) {
t.Helper()
platformBootclasspath := ctx.ModuleForTests("platform-bootclasspath", "android_common")
indexRule := platformBootclasspath.Rule("monolithic_hidden_API_index")
java.CheckHiddenAPIRuleInputs(t, expectedInputs, indexRule)
java.CheckHiddenAPIRuleInputs(t, "index", expectedInputs, indexRule)
}
fragment := java.ApexVariantReference{
@@ -4471,9 +4471,9 @@ func TestBootDexJarsFromSourcesAndPrebuilts(t *testing.T) {
// Verify the correct module jars contribute to the hiddenapi index file.
checkHiddenAPIIndexInputs(t, ctx, `
.intermediates/libbar.stubs/android_common/combined/libbar.stubs.jar
.intermediates/libfoo/android_common_myapex/combined/libfoo.jar
`)
out/soong/.intermediates/libbar.stubs/android_common/combined/libbar.stubs.jar
out/soong/.intermediates/libfoo/android_common_myapex/combined/libfoo.jar
`)
})
t.Run("apex_set only", func(t *testing.T) {
@@ -4512,9 +4512,9 @@ func TestBootDexJarsFromSourcesAndPrebuilts(t *testing.T) {
// Verify the correct module jars contribute to the hiddenapi index file.
checkHiddenAPIIndexInputs(t, ctx, `
.intermediates/libbar.stubs/android_common/combined/libbar.stubs.jar
.intermediates/libfoo/android_common_myapex/combined/libfoo.jar
`)
out/soong/.intermediates/libbar.stubs/android_common/combined/libbar.stubs.jar
out/soong/.intermediates/libfoo/android_common_myapex/combined/libfoo.jar
`)
})
t.Run("prebuilt with source library preferred", func(t *testing.T) {
@@ -4633,9 +4633,9 @@ func TestBootDexJarsFromSourcesAndPrebuilts(t *testing.T) {
// Verify the correct module jars contribute to the hiddenapi index file.
checkHiddenAPIIndexInputs(t, ctx, `
.intermediates/prebuilt_libbar.stubs/android_common/combined/libbar.stubs.jar
.intermediates/prebuilt_libfoo/android_common_myapex/combined/libfoo.jar
`)
out/soong/.intermediates/prebuilt_libbar.stubs/android_common/combined/libbar.stubs.jar
out/soong/.intermediates/prebuilt_libfoo/android_common_myapex/combined/libfoo.jar
`)
})
t.Run("prebuilt with source apex preferred", func(t *testing.T) {
@@ -4707,9 +4707,9 @@ func TestBootDexJarsFromSourcesAndPrebuilts(t *testing.T) {
// Verify the correct module jars contribute to the hiddenapi index file.
checkHiddenAPIIndexInputs(t, ctx, `
.intermediates/libbar/android_common_myapex/javac/libbar.jar
.intermediates/libfoo/android_common_apex10000/javac/libfoo.jar
`)
out/soong/.intermediates/libbar/android_common_myapex/javac/libbar.jar
out/soong/.intermediates/libfoo/android_common_apex10000/javac/libfoo.jar
`)
})
t.Run("prebuilt preferred with source apex disabled", func(t *testing.T) {
@@ -4783,9 +4783,9 @@ func TestBootDexJarsFromSourcesAndPrebuilts(t *testing.T) {
// Verify the correct module jars contribute to the hiddenapi index file.
checkHiddenAPIIndexInputs(t, ctx, `
.intermediates/prebuilt_libbar.stubs/android_common/combined/libbar.stubs.jar
.intermediates/prebuilt_libfoo/android_common_myapex/combined/libfoo.jar
`)
out/soong/.intermediates/prebuilt_libbar.stubs/android_common/combined/libbar.stubs.jar
out/soong/.intermediates/prebuilt_libfoo/android_common_myapex/combined/libfoo.jar
`)
})
}