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

Fix apex_test.go and add it to Android.bp

Browse Source 
apex_test.go wasn't listed in the Android.bp file, which allowed
it to bitrot.  Make the API level methods take a PathContext
so that they can be called from a test using configErrorWrapper.
Also fix an int that was converted to a string.

Test: apex_test.go
Change-Id: I1ff87134c837bd5d344d22550baabde10d1b0b2e
This commit is contained in:
Colin Cross
2020-10-02 10:26:04 -07:00
parent 973f46703b
commit 9f720ce52a
4 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
android/Android.bp
View File

@@ -63,6 +63,7 @@ bootstrap_go_package {
testSrcs: [ testSrcs: [
"android_test.go", "android_test.go",
"androidmk_test.go", "androidmk_test.go",
"apex_test.go",
"arch_test.go", "arch_test.go",
"config_test.go", "config_test.go",
"csuite_config_test.go", "csuite_config_test.go",

6
android/apex.go
View File

@@ -42,7 +42,7 @@ type ApexInfo struct {
InApexes []string InApexes []string
} }
func (i ApexInfo) mergedName(ctx EarlyModuleContext) string { func (i ApexInfo) mergedName(ctx PathContext) string {
name := "apex" + strconv.Itoa(i.MinSdkVersion(ctx).FinalOrFutureInt()) name := "apex" + strconv.Itoa(i.MinSdkVersion(ctx).FinalOrFutureInt())
for _, sdk := range i.RequiredSdks { for _, sdk := range i.RequiredSdks {
name += "_" + sdk.Name + "_" + sdk.Version name += "_" + sdk.Name + "_" + sdk.Version
@@ -50,7 +50,7 @@ func (i ApexInfo) mergedName(ctx EarlyModuleContext) string {
return name return name
} }
func (this *ApexInfo) MinSdkVersion(ctx EarlyModuleContext) ApiLevel { func (this *ApexInfo) MinSdkVersion(ctx PathContext) ApiLevel {
return ApiLevelOrPanic(ctx, this.MinSdkVersionStr) return ApiLevelOrPanic(ctx, this.MinSdkVersionStr)
} }
@@ -358,7 +358,7 @@ func (a byApexName) Less(i, j int) bool { return a[i].ApexVariationName < a[j].A
// mergeApexVariations deduplicates APEX variations that would build identically into a common // mergeApexVariations deduplicates APEX variations that would build identically into a common
// variation. It returns the reduced list of variations and a list of aliases from the original // variation. It returns the reduced list of variations and a list of aliases from the original
// variation names to the new variation names. // variation names to the new variation names.
func mergeApexVariations(ctx EarlyModuleContext, apexVariations []ApexInfo) (merged []ApexInfo, aliases [][2]string) { func mergeApexVariations(ctx PathContext, apexVariations []ApexInfo) (merged []ApexInfo, aliases [][2]string) {
sort.Sort(byApexName(apexVariations)) sort.Sort(byApexName(apexVariations))
seen := make(map[string]int) seen := make(map[string]int)
for _, apexInfo := range apexVariations { for _, apexInfo := range apexVariations {

36
android/apex_test.go
View File

@@ -29,10 +29,10 @@ func Test_mergeApexVariations(t *testing.T) {
{ {
name: "single", name: "single",
in: []ApexInfo{ in: []ApexInfo{
{"foo", 10000, false, nil, []string{"foo"}}, {"foo", "current", false, nil, []string{"foo"}},
}, },
wantMerged: []ApexInfo{ wantMerged: []ApexInfo{
{"apex10000", 10000, false, nil, []string{"foo"}}, {"apex10000", "current", false, nil, []string{"foo"}},
}, },
wantAliases: [][2]string{ wantAliases: [][2]string{
{"foo", "apex10000"}, {"foo", "apex10000"},
@@ -41,11 +41,11 @@ func Test_mergeApexVariations(t *testing.T) {
{ {
name: "merge", name: "merge",
in: []ApexInfo{ in: []ApexInfo{
{"foo", 10000, false, SdkRefs{{"baz", "1"}}, []string{"foo"}}, {"foo", "current", false, SdkRefs{{"baz", "1"}}, []string{"foo"}},
{"bar", 10000, false, SdkRefs{{"baz", "1"}}, []string{"bar"}}, {"bar", "current", false, SdkRefs{{"baz", "1"}}, []string{"bar"}},
}, },
wantMerged: []ApexInfo{ wantMerged: []ApexInfo{
{"apex10000_baz_1", 10000, false, SdkRefs{{"baz", "1"}}, []string{"bar", "foo"}}, {"apex10000_baz_1", "current", false, SdkRefs{{"baz", "1"}}, []string{"bar", "foo"}},
}, },
wantAliases: [][2]string{ wantAliases: [][2]string{
{"bar", "apex10000_baz_1"}, {"bar", "apex10000_baz_1"},
@@ -55,12 +55,12 @@ func Test_mergeApexVariations(t *testing.T) {
{ {
name: "don't merge version", name: "don't merge version",
in: []ApexInfo{ in: []ApexInfo{
{"foo", 10000, false, nil, []string{"foo"}}, {"foo", "current", false, nil, []string{"foo"}},
{"bar", 30, false, nil, []string{"bar"}}, {"bar", "30", false, nil, []string{"bar"}},
}, },
wantMerged: []ApexInfo{ wantMerged: []ApexInfo{
{"apex30", 30, false, nil, []string{"bar"}}, {"apex30", "30", false, nil, []string{"bar"}},
{"apex10000", 10000, false, nil, []string{"foo"}}, {"apex10000", "current", false, nil, []string{"foo"}},
}, },
wantAliases: [][2]string{ wantAliases: [][2]string{
{"bar", "apex30"}, {"bar", "apex30"},
@@ -70,11 +70,11 @@ func Test_mergeApexVariations(t *testing.T) {
{ {
name: "merge updatable", name: "merge updatable",
in: []ApexInfo{ in: []ApexInfo{
{"foo", 10000, false, nil, []string{"foo"}}, {"foo", "current", false, nil, []string{"foo"}},
{"bar", 10000, true, nil, []string{"bar"}}, {"bar", "current", true, nil, []string{"bar"}},
}, },
wantMerged: []ApexInfo{ wantMerged: []ApexInfo{
{"apex10000", 10000, true, nil, []string{"bar", "foo"}}, {"apex10000", "current", true, nil, []string{"bar", "foo"}},
}, },
wantAliases: [][2]string{ wantAliases: [][2]string{
{"bar", "apex10000"}, {"bar", "apex10000"},
@@ -84,12 +84,12 @@ func Test_mergeApexVariations(t *testing.T) {
{ {
name: "don't merge sdks", name: "don't merge sdks",
in: []ApexInfo{ in: []ApexInfo{
{"foo", 10000, false, SdkRefs{{"baz", "1"}}, []string{"foo"}}, {"foo", "current", false, SdkRefs{{"baz", "1"}}, []string{"foo"}},
{"bar", 10000, false, SdkRefs{{"baz", "2"}}, []string{"bar"}}, {"bar", "current", false, SdkRefs{{"baz", "2"}}, []string{"bar"}},
}, },
wantMerged: []ApexInfo{ wantMerged: []ApexInfo{
{"apex10000_baz_2", 10000, false, SdkRefs{{"baz", "2"}}, []string{"bar"}}, {"apex10000_baz_2", "current", false, SdkRefs{{"baz", "2"}}, []string{"bar"}},
{"apex10000_baz_1", 10000, false, SdkRefs{{"baz", "1"}}, []string{"foo"}}, {"apex10000_baz_1", "current", false, SdkRefs{{"baz", "1"}}, []string{"foo"}},
}, },
wantAliases: [][2]string{ wantAliases: [][2]string{
{"bar", "apex10000_baz_2"}, {"bar", "apex10000_baz_2"},
@@ -99,7 +99,9 @@ func Test_mergeApexVariations(t *testing.T) {
} }
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
gotMerged, gotAliases := mergeApexVariations(tt.in) config := TestConfig(buildDir, nil, "", nil)
ctx := &configErrorWrapper{config: config}
gotMerged, gotAliases := mergeApexVariations(ctx, tt.in)
if !reflect.DeepEqual(gotMerged, tt.wantMerged) { if !reflect.DeepEqual(gotMerged, tt.wantMerged) {
t.Errorf("mergeApexVariations() gotMerged = %v, want %v", gotMerged, tt.wantMerged) t.Errorf("mergeApexVariations() gotMerged = %v, want %v", gotMerged, tt.wantMerged)
} }

6
android/api_levels.go
View File

@@ -152,7 +152,7 @@ var FirstNonLibAndroidSupportVersion = uncheckedFinalApiLevel(21)
// * "30" -> "30" // * "30" -> "30"
// * "R" -> "30" // * "R" -> "30"
// * "S" -> "S" // * "S" -> "S"
func ReplaceFinalizedCodenames(ctx EarlyModuleContext, raw string) string { func ReplaceFinalizedCodenames(ctx PathContext, raw string) string {
num, ok := getFinalCodenamesMap(ctx.Config())[raw] num, ok := getFinalCodenamesMap(ctx.Config())[raw]
if !ok { if !ok {
return raw return raw
@@ -175,7 +175,7 @@ func ReplaceFinalizedCodenames(ctx EarlyModuleContext, raw string) string {
// //
// Inputs that are not "current", known previews, or convertible to an integer // Inputs that are not "current", known previews, or convertible to an integer
// will return an error. // will return an error.
func ApiLevelFromUser(ctx EarlyModuleContext, raw string) (ApiLevel, error) { func ApiLevelFromUser(ctx PathContext, raw string) (ApiLevel, error) {
if raw == "" { if raw == "" {
panic("API level string must be non-empty") panic("API level string must be non-empty")
} }
@@ -203,7 +203,7 @@ func ApiLevelFromUser(ctx EarlyModuleContext, raw string) (ApiLevel, error) {
// Converts an API level string `raw` into an ApiLevel in the same method as // Converts an API level string `raw` into an ApiLevel in the same method as
// `ApiLevelFromUser`, but the input is assumed to have no errors and any errors // `ApiLevelFromUser`, but the input is assumed to have no errors and any errors
// will panic instead of returning an error. // will panic instead of returning an error.
func ApiLevelOrPanic(ctx EarlyModuleContext, raw string) ApiLevel { func ApiLevelOrPanic(ctx PathContext, raw string) ApiLevel {
value, err := ApiLevelFromUser(ctx, raw) value, err := ApiLevelFromUser(ctx, raw)
if err != nil { if err != nil {
panic(err.Error()) panic(err.Error())