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

Support musl builds in Make

Browse Source 
Rewrite linux_musl to linux when exporting to Make.

Bug: 190084016
Test: m USE_HOST_MUSL=true adb
Change-Id: I48eed5bd7380a07c5106a9b2bd96899fb58f7a7f
This commit is contained in:
Colin Cross
2021-08-16 14:46:46 -07:00
parent 380dbb9327
commit c74ea4b77b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/androidmk.go
View File

@@ -571,7 +571,7 @@ func (a *AndroidMkEntries) fillInEntries(ctx fillInEntriesContext, mod blueprint
if host { if host {
makeOs := amod.Os().String() makeOs := amod.Os().String()
if amod.Os() == Linux || amod.Os() == LinuxBionic { if amod.Os() == Linux || amod.Os() == LinuxBionic || amod.Os() == LinuxMusl {
makeOs = "linux" makeOs = "linux"
} }
a.SetString("LOCAL_MODULE_HOST_OS", makeOs) a.SetString("LOCAL_MODULE_HOST_OS", makeOs)

2
apex/androidmk.go
View File

@@ -212,7 +212,7 @@ func (a *apexBundle) androidMkForFiles(w io.Writer, apexBundleName, apexName, mo
} }
if host { if host {
makeOs := fi.module.Target().Os.String() makeOs := fi.module.Target().Os.String()
if fi.module.Target().Os == android.Linux || fi.module.Target().Os == android.LinuxBionic { if fi.module.Target().Os == android.Linux || fi.module.Target().Os == android.LinuxBionic || fi.module.Target().Os == android.LinuxMusl {
makeOs = "linux" makeOs = "linux"
} }
fmt.Fprintln(w, "LOCAL_MODULE_HOST_OS :=", makeOs) fmt.Fprintln(w, "LOCAL_MODULE_HOST_OS :=", makeOs)