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

Merge "Use the correct ninja binary for the host in aninja" into main am: da93996abe

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

Change-Id: I0567584ea804070517bc3938da0a2fd62d507c56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-07-02 23:11:29 +00:00
committed by Automerger Merge Worker
parent edaf1e6120 da93996abe
commit 10e5e26a8b
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
bin/aninja
View File

@@ -20,6 +20,19 @@ source $(cd $(dirname $BASH_SOURCE) &> /dev/null && pwd)/../../make/shell_utils.
require_top
require_lunch
cd $(gettop)
prebuilts/build-tools/linux-x86/bin/ninja -f out/combined-${TARGET_PRODUCT}.ninja "$@"
case $(uname -s) in
Darwin)
host_arch=darwin-x86
;;
Linux)
host_arch=linux-x86
;;
*)
>&2 echo Unknown host $(uname -s)
exit 1
;;
esac
cd $(gettop)
prebuilts/build-tools/${host_arch}/bin/ninja -f out/combined-${TARGET_PRODUCT}.ninja "$@"