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

This commit is contained in:
Treehugger Robot 2022-07-01 17:11:41 +00:00 committed by Gerrit Code Review
commit f47fe38686

View file

@ -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