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

Retry: Detect invalid arch specific properties in snapshot

Browse Source 
Previously, the snapshot code did not know whether a specific property
could be arch specific or not and assumed that they all were which
meant that it could generate snapshots containing arch specific values
for properties that are not arch specific and so would fail when
unpacked.

This change requires arch specific fields in SdkMemberProperties to be
tagged as such using `android:"arch_variant"` (just as in module input
property structures). Any property without that must have properties
that are common across all variants.

Bug: 155628860
Test: m nothing
Change-Id: I3df60f0b53ba02ec2c55a80c7da058eac5909d26
This commit is contained in:
Paul Duffin
2020-05-06 10:23:19 +01:00
parent a71fe150fa
commit 864e1b45db
5 changed files with 70 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
sdk/sdk_test.go
View File

@@ -226,8 +226,8 @@ func TestSDkInstall(t *testing.T) {
}
type EmbeddedPropertiesStruct struct {
S_Embedded_Common string
S_Embedded_Different string
S_Embedded_Common string `android:"arch_variant"`
S_Embedded_Different string `android:"arch_variant"`
}
type testPropertiesStruct struct {
@@ -235,11 +235,11 @@ type testPropertiesStruct struct {
private string
Public_Kept string `sdk:"keep"`
S_Common string
S_Different string
S_Different string `android:"arch_variant"`
A_Common []string
A_Different []string
A_Different []string `android:"arch_variant"`
F_Common *bool
F_Different *bool
F_Different *bool `android:"arch_variant"`
EmbeddedPropertiesStruct
}
@@ -346,3 +346,26 @@ func TestCommonValueOptimization(t *testing.T) {
},
structs[1])
}
func TestCommonValueOptimization_InvalidArchSpecificVariants(t *testing.T) {
common := &testPropertiesStruct{name: "common"}
structs := []propertiesContainer{
&testPropertiesStruct{
name: "struct-0",
S_Common: "should-be-but-is-not-common0",
},
&testPropertiesStruct{
name: "struct-1",
S_Common: "should-be-but-is-not-common1",
},
}
extractor := newCommonValueExtractor(common)
h := TestHelper{t}
err := extractor.extractCommonProperties(common, structs)
h.AssertErrorMessageEquals("unexpected error", `field "S_Common" is not tagged as "arch_variant" but has arch specific properties:
"struct-0" has value "should-be-but-is-not-common0"
"struct-1" has value "should-be-but-is-not-common1"`, err)
}