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

Merge "Remove linux_glibc musl hack" am: d5aa2e0da3 am: f7daa06e3a

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

Change-Id: I36df2717527a2a6cd06c9200c704fbdd856cf14a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-04-15 00:19:38 +00:00
committed by Automerger Merge Worker
parent 3830ae1ecd f7daa06e3a
commit 3c57fd97f3
2 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
android/arch.go
View File

@@ -1199,14 +1199,6 @@ func (m *ModuleBase) setOSProperties(ctx BottomUpMutatorContext) {
if bionicProperties, ok := getChildPropertyStruct(ctx, targetProp, field, prefix); ok {
mergePropertyStruct(ctx, genProps, bionicProperties)
}
// Special case: to ease the transition from glibc to musl, apply linux_glibc
// properties (which has historically mean host linux) to musl variants.
field = "Linux_glibc"
prefix = "target.linux_glibc"
if bionicProperties, ok := getChildPropertyStruct(ctx, targetProp, field, prefix); ok {
mergePropertyStruct(ctx, genProps, bionicProperties)
}
}
// Handle target OS properties in the form:
@@ -1426,14 +1418,6 @@ func getArchProperties(ctx BaseMutatorContext, archProperties interface{}, arch
if osArchProperties, ok := getChildPropertyStruct(ctx, targetProp, field, userFriendlyField); ok {
result = append(result, osArchProperties)
}
// Special case: to ease the transition from glibc to musl, apply linux_glibc
// properties (which has historically mean host linux) to musl variants.
field = "Linux_glibc_" + archType.Name
userFriendlyField = "target.linux_glibc_" + archType.Name
if osArchProperties, ok := getChildPropertyStruct(ctx, targetProp, field, userFriendlyField); ok {
result = append(result, osArchProperties)
}
}
}

4
android/arch_test.go
View File

@@ -606,12 +606,12 @@ func TestArchProperties(t *testing.T) {
{
module: "foo",
variant: "linux_musl_x86_64",
property: []string{"root", "host", "linux", "host_linux", "musl", "linux_glibc", "linux_musl", "not_windows", "x86_64", "lib64", "linux_x86_64", "linux_musl_x86_64", "linux_glibc_x86_64"},
property: []string{"root", "host", "linux", "host_linux", "musl", "linux_musl", "not_windows", "x86_64", "lib64", "linux_x86_64", "linux_musl_x86_64"},
},
{
module: "foo",
variant: "linux_musl_x86",
property: []string{"root", "host", "linux", "host_linux", "musl", "linux_glibc", "linux_musl", "not_windows", "x86", "lib32", "linux_x86", "linux_musl_x86", "linux_glibc_x86"},
property: []string{"root", "host", "linux", "host_linux", "musl", "linux_musl", "not_windows", "x86", "lib32", "linux_x86", "linux_musl_x86"},
},
},
},