commit b37a92ccc82f327e1f8ed686c0a16d5ac9c828ee
author Colin Cross <ccross@android.com> Thu Aug 26 01:14:47 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 26 01:14:47 2021 +0000
tree def63f4b85ee56b9587ca4d2dd39a67e87d84772
parent 19312d42246a463f4e93c38afe5c435cfacba83d
parent c74ea4b77b45f0999e8b51f3d4d820caacde8873

Merge "Support musl builds in Make"

android/androidmk.go

diff --git a/android/androidmk.go b/android/androidmk.go
index f032f1b..9853d2c 100644
--- a/android/androidmk.go
+++ b/android/androidmk.go
@@ -571,7 +571,7 @@
 
 	if host {
 		makeOs := amod.Os().String()
-		if amod.Os() == Linux || amod.Os() == LinuxBionic {
+		if amod.Os() == Linux || amod.Os() == LinuxBionic || amod.Os() == LinuxMusl {
 			makeOs = "linux"
 		}
 		a.SetString("LOCAL_MODULE_HOST_OS", makeOs)

apex/androidmk.go

diff --git a/apex/androidmk.go b/apex/androidmk.go
index ebf0833..2f10904 100644
--- a/apex/androidmk.go
+++ b/apex/androidmk.go
@@ -212,7 +212,7 @@
 			}
 			if host {
 				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"
 				}
 				fmt.Fprintln(w, "LOCAL_MODULE_HOST_OS :=", makeOs)