Require prebuilt_bootclasspath_fragment to provide hidden API files

Previously, the prebuilt_bootclasspath_fragment was not required to
provide hidden API files as not all usages of that module provided
them. That should no longer be the case so this change makes the
prebuilt_bootclasspath_fragment stricter and so now always require
them.

Bug: 194063708
Test: m out/soong/hiddenapi/hiddenapi-flags.csv
      - check that this does not change the contents.
Change-Id: I3f19a1b4246f09a927c0f6b0f41b8678150d6cc2
This commit is contained in:
Paul Duffin
2021-07-19 13:23:40 +01:00
parent 40a3f65430
commit 54e4197da1
3 changed files with 89 additions and 29 deletions

View File

@@ -383,6 +383,13 @@ func TestBootclasspathFragmentInArtApex(t *testing.T) {
apex_available: [
"com.android.art",
],
hidden_api: {
annotation_flags: "mybootclasspathfragment/annotation-flags.csv",
metadata: "mybootclasspathfragment/metadata.csv",
index: "mybootclasspathfragment/index.csv",
stub_flags: "mybootclasspathfragment/stub-flags.csv",
all_flags: "mybootclasspathfragment/all-flags.csv",
},
}
`, contentsInsert(contents), prefer)
return android.FixtureAddTextFile("prebuilts/module_sdk/art/Android.bp", text)
@@ -582,6 +589,13 @@ func TestBootclasspathFragmentInPrebuiltArtApex(t *testing.T) {
apex_available: [
"com.android.art",
],
hidden_api: {
annotation_flags: "mybootclasspathfragment/annotation-flags.csv",
metadata: "mybootclasspathfragment/metadata.csv",
index: "mybootclasspathfragment/index.csv",
stub_flags: "mybootclasspathfragment/stub-flags.csv",
all_flags: "mybootclasspathfragment/all-flags.csv",
},
}
`)