Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b37a92cc authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge "Support musl builds in Make"

parents 19312d42 c74ea4b7

android/androidmk.go

+1 −1
Original line number Diff line number Diff line
@@ -571,7 +571,7 @@ func (a *AndroidMkEntries) fillInEntries(ctx fillInEntriesContext, mod blueprint 


	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

+1 −1
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ func (a *apexBundle) androidMkForFiles(w io.Writer, apexBundleName, apexName, mo 
			}

			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)