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

Merge "Allow platform_bootclasspath to specify contributing fragments" am: 49ab1d38de am: 75e90d6974 am: 4a385f9987

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1670067

Change-Id: Ie7e07eb17dd14aaec57b9c9de02483c8869ef309
This commit is contained in:
Paul Duffin
2021-04-08 21:55:58 +00:00
committed by Automerger Merge Worker
parent ea1ef0beaf 4a385f9987
commit 2fe363ff6a
3 changed files with 78 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
apex/platform_bootclasspath_test.go
View File

@@ -127,10 +127,28 @@ func TestPlatformBootclasspathDependencies(t *testing.T) {
platform_bootclasspath {
name: "myplatform-bootclasspath",
fragments: [
{
apex: "com.android.art",
module: "art-bootclasspath-fragment",
},
],
}
`,
)
java.CheckPlatformBootclasspathModules(t, result, "myplatform-bootclasspath", []string{
"com.android.art:baz",
"com.android.art:quuz",
"platform:foo",
"myapex:bar",
})
java.CheckPlatformBootclasspathFragments(t, result, "myplatform-bootclasspath", []string{
`com.android.art:art-bootclasspath-fragment`,
})
// Make sure that the myplatform-bootclasspath has the correct dependencies.
CheckModuleDependencies(t, result.TestContext, "myplatform-bootclasspath", "android_common", []string{
`platform:dex2oatd`,
@@ -138,6 +156,7 @@ func TestPlatformBootclasspathDependencies(t *testing.T) {
`com.android.art:quuz`,
`platform:foo`,
`myapex:bar`,
`com.android.art:art-bootclasspath-fragment`,
})
}