android_filesystem_defaults and visibility rule
android_systemimage_defaults is deleted and android_filesystem_defaults is created so that we can have defaults not only for android_system_image, but also all android_filesystem modules and its derivatives. Also, change adds a check which ensures that the partition_type of the filesystem and its defaults are the same. Bug: 330665150 Test: m Change-Id: If635c794534ed89d264eaf7dfc406a8245b8e9f0
This commit is contained in:
@@ -367,7 +367,7 @@ func TestFileSystemWithCoverageVariants(t *testing.T) {
|
||||
|
||||
func TestSystemImageDefaults(t *testing.T) {
|
||||
result := fixture.RunTestWithBp(t, `
|
||||
android_system_image_defaults {
|
||||
android_filesystem_defaults {
|
||||
name: "defaults",
|
||||
multilib: {
|
||||
common: {
|
||||
@@ -433,3 +433,25 @@ func TestSystemImageDefaults(t *testing.T) {
|
||||
android.AssertStringListContains(t, "missing entry", fs.entries, e)
|
||||
}
|
||||
}
|
||||
|
||||
func TestInconsistentPartitionTypesInDefaults(t *testing.T) {
|
||||
fixture.ExtendWithErrorHandler(android.FixtureExpectsOneErrorPattern(
|
||||
"doesn't match with the partition type")).
|
||||
RunTestWithBp(t, `
|
||||
android_filesystem_defaults {
|
||||
name: "system_ext_def",
|
||||
partition_type: "system_ext",
|
||||
}
|
||||
|
||||
android_filesystem_defaults {
|
||||
name: "system_def",
|
||||
partition_type: "system",
|
||||
defaults: ["system_ext_def"],
|
||||
}
|
||||
|
||||
android_system_image {
|
||||
name: "system",
|
||||
defaults: ["system_def"],
|
||||
}
|
||||
`)
|
||||
}
|
||||
|
Reference in New Issue
Block a user