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

Make TestPlatformBootclasspath_Fragments more realistic

Browse Source 
Move the bootclasspath_fragment to be part of an apex to match how they
are expected to be used. Also adds the bar library to the boot jars
config as every module in a bootclasspath_fragment that is referenced
from a platform_bootclasspath module is expected to be in the config.

Bug: 179354495
Test: m nothing
Change-Id: I6f826dce9c006d630ee31d4171fe6fb458cc9442
This commit is contained in:
Paul Duffin
2021-06-09 15:31:05 +01:00
parent ffa8375f07
commit dc3f9566a2
1 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
apex/platform_bootclasspath_test.go
View File

@@ -36,13 +36,18 @@ var prepareForTestWithPlatformBootclasspath = android.GroupFixturePreparers(
func TestPlatformBootclasspath_Fragments(t *testing.T) { func TestPlatformBootclasspath_Fragments(t *testing.T) {
result := android.GroupFixturePreparers( result := android.GroupFixturePreparers(
prepareForTestWithPlatformBootclasspath, prepareForTestWithPlatformBootclasspath,
prepareForTestWithMyapex,
java.PrepareForTestWithJavaSdkLibraryFiles, java.PrepareForTestWithJavaSdkLibraryFiles,
java.FixtureWithLastReleaseApis("foo"), java.FixtureWithLastReleaseApis("foo"),
java.FixtureConfigureBootJars("myapex:bar"),
android.FixtureWithRootAndroidBp(` android.FixtureWithRootAndroidBp(`
platform_bootclasspath { platform_bootclasspath {
name: "platform-bootclasspath", name: "platform-bootclasspath",
fragments: [ fragments: [
{module:"bar-fragment"}, {
apex: "myapex",
module:"bar-fragment",
},
], ],
hidden_api: { hidden_api: {
unsupported: [ unsupported: [
@@ -72,9 +77,25 @@ func TestPlatformBootclasspath_Fragments(t *testing.T) {
}, },
} }
apex {
name: "myapex",
key: "myapex.key",
bootclasspath_fragments: [
"bar-fragment",
],
updatable: false,
}
apex_key {
name: "myapex.key",
public_key: "testkey.avbpubkey",
private_key: "testkey.pem",
}
bootclasspath_fragment { bootclasspath_fragment {
name: "bar-fragment", name: "bar-fragment",
contents: ["bar"], contents: ["bar"],
apex_available: ["myapex"],
api: { api: {
stub_libs: ["foo"], stub_libs: ["foo"],
}, },
@@ -108,10 +129,12 @@ func TestPlatformBootclasspath_Fragments(t *testing.T) {
java_library { java_library {
name: "bar", name: "bar",
apex_available: ["myapex"],
srcs: ["a.java"], srcs: ["a.java"],
system_modules: "none", system_modules: "none",
sdk_version: "none", sdk_version: "none",
compile_dex: true, compile_dex: true,
permitted_packages: ["bar"],
} }
java_sdk_library { java_sdk_library {
@@ -136,11 +159,11 @@ func TestPlatformBootclasspath_Fragments(t *testing.T) {
android.AssertPathsRelativeToTopEquals(t, message, expected, info.FlagsFilesByCategory[category]) android.AssertPathsRelativeToTopEquals(t, message, expected, info.FlagsFilesByCategory[category])
} }
android.AssertPathsRelativeToTopEquals(t, "stub flags", []string{"out/soong/.intermediates/bar-fragment/android_common/modular-hiddenapi/stub-flags.csv"}, info.StubFlagsPaths) android.AssertPathsRelativeToTopEquals(t, "stub flags", []string{"out/soong/.intermediates/bar-fragment/android_common_apex10000/modular-hiddenapi/stub-flags.csv"}, info.StubFlagsPaths)
android.AssertPathsRelativeToTopEquals(t, "annotation flags", []string{"out/soong/.intermediates/bar-fragment/android_common/modular-hiddenapi/annotation-flags.csv"}, info.AnnotationFlagsPaths) android.AssertPathsRelativeToTopEquals(t, "annotation flags", []string{"out/soong/.intermediates/bar-fragment/android_common_apex10000/modular-hiddenapi/annotation-flags.csv"}, info.AnnotationFlagsPaths)
android.AssertPathsRelativeToTopEquals(t, "metadata flags", []string{"out/soong/.intermediates/bar-fragment/android_common/modular-hiddenapi/metadata.csv"}, info.MetadataPaths) android.AssertPathsRelativeToTopEquals(t, "metadata flags", []string{"out/soong/.intermediates/bar-fragment/android_common_apex10000/modular-hiddenapi/metadata.csv"}, info.MetadataPaths)
android.AssertPathsRelativeToTopEquals(t, "index flags", []string{"out/soong/.intermediates/bar-fragment/android_common/modular-hiddenapi/index.csv"}, info.IndexPaths) android.AssertPathsRelativeToTopEquals(t, "index flags", []string{"out/soong/.intermediates/bar-fragment/android_common_apex10000/modular-hiddenapi/index.csv"}, info.IndexPaths)
android.AssertPathsRelativeToTopEquals(t, "all flags", []string{"out/soong/.intermediates/bar-fragment/android_common/modular-hiddenapi/all-flags.csv"}, info.AllFlagsPaths) android.AssertPathsRelativeToTopEquals(t, "all flags", []string{"out/soong/.intermediates/bar-fragment/android_common_apex10000/modular-hiddenapi/all-flags.csv"}, info.AllFlagsPaths)
} }
func TestPlatformBootclasspathDependencies(t *testing.T) { func TestPlatformBootclasspathDependencies(t *testing.T) {