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

Merge "Support musl builds in Make" am: b37a92ccc8

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

Change-Id: I771db86c62207bde3e4ba60569e4d3ebbfe32358
This commit is contained in:
Colin Cross
2021-08-26 01:27:24 +00:00
committed by Automerger Merge Worker
parent b4adefa58e b37a92ccc8
commit 8dae8cbcc1
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)