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

Commit c74ea4b7 authored by Colin Cross's avatar Colin Cross
Browse files

Support musl builds in Make 

Rewrite linux_musl to linux when exporting to Make.

Bug: 190084016
Test: m USE_HOST_MUSL=true adb
Change-Id: I48eed5bd7380a07c5106a9b2bd96899fb58f7a7f
parent 380dbb93

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)