StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2139099

Change-Id: I97e79b3df1e605d20276f06c407a3ce74a1edfd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-07-01 17:37:55 +00:00
committed by Automerger Merge Worker
parent 82a2240a5c f47fe38686
commit 9fe821b0c6
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
android/androidmk.go
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