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

Commit f47fe386 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Don't pass host cross linux musl modules to Make"

parents 281d421f 9a027be6

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