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

Commit 9a027be6 authored by Colin Cross's avatar Colin Cross
Browse files

Don't pass host cross linux musl modules to Make 

Make doesn't understand host cross linux musl modules, don't pass
them to make.  Continue passing them to make when USE_HOST_MUSL=true
is set.

Bug: 236052820
Test: builds with linux musl arm64 host cross configured
Change-Id: Id8b90ca0fa698fdf658156b458cc385387768414
parent 39a1814f

android/androidmk.go

+4 −1
Original line number Diff line number Diff line
@@ -945,7 +945,10 @@ func shouldSkipAndroidMkProcessing(module *ModuleBase) bool { 
	return !module.Enabled() ||

		module.commonProperties.HideFromMake ||

		// Make does not understand LinuxBionic

		module.Os() == LinuxBionic

		module.Os() == LinuxBionic ||

		// Make does not understand LinuxMusl, except when we are building with USE_HOST_MUSL=true

		// and all host binaries are LinuxMusl

		(module.Os() == LinuxMusl && module.Target().HostCross)

}



// A utility func to format LOCAL_TEST_DATA outputs. See the comments on DataPath to understand how