Fix tests to use correct fixtures for configuring (Apex)BootJars.

This is in preparation to r.android.com/1740313 where setting correct
variables would be enforced (i.e. apex and non-apex boot jars must be in
config.ApexBootJars and config.BootJars correspondingly).

Bug: 191369843
Test: m nothing
Change-Id: Ic86680c1f7af53d229083b2cc58beb3ceccb4b6a
This commit is contained in:
satayev
2021-08-06 17:49:46 +01:00
parent 47c456228c
commit abcd59731e
8 changed files with 90 additions and 18 deletions

View File

@@ -39,7 +39,7 @@ func TestPlatformBootclasspath_Fragments(t *testing.T) {
prepareForTestWithMyapex,
java.PrepareForTestWithJavaSdkLibraryFiles,
java.FixtureWithLastReleaseApis("foo"),
java.FixtureConfigureBootJars("myapex:bar"),
java.FixtureConfigureApexBootJars("myapex:bar"),
android.FixtureWithRootAndroidBp(`
platform_bootclasspath {
name: "platform-bootclasspath",
@@ -194,6 +194,7 @@ func TestPlatformBootclasspathDependencies(t *testing.T) {
bootclasspath_fragment {
name: "art-bootclasspath-fragment",
image_name: "art",
apex_available: [
"com.android.art",
],