tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix location of host tools

Browse source 
Host tools are in out/host/linux-x86/bin now instead of
out/soong/host/linux-x86/bin.

Bug: 204136549
Test: forrest
Change-Id: I293accdde5ee4d1d21a471e12ba66e169f9410fc
This commit is contained in:
Colin Cross 2021-11-05 14:07:48 -07:00
parent ed7cc80be2
commit 6a4d3ba138
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build_kzip.bash
View file

@ -61,5 +61,5 @@ declare -r kzip_count=$(find "$out" -name '*.kzip' | wc -l)
# Pack # Pack
# TODO(asmundak): this should be done by soong. # TODO(asmundak): this should be done by soong.
declare -r allkzip="$KZIP_NAME.kzip" declare -r allkzip="$KZIP_NAME.kzip"
"$out/soong/host/linux-x86/bin/merge_zips" "$DIST_DIR/$allkzip" @<(find "$out" -name '*.kzip') "$out/host/linux-x86/bin/merge_zips" "$DIST_DIR/$allkzip" @<(find "$out" -name '*.kzip')

5
cuj/run_cuj_tests.sh
View file

@ -18,11 +18,10 @@ readonly ANDROID_TOP="$(cd $(dirname $0)/../../..; pwd)"
cd "$ANDROID_TOP" cd "$ANDROID_TOP"
export OUT_DIR="${OUT_DIR:-out}" export OUT_DIR="${OUT_DIR:-out}"
readonly SOONG_OUT="${OUT_DIR}/soong"
build/soong/soong_ui.bash --make-mode "${SOONG_OUT}/host/${OS}-x86/bin/cuj_tests" build/soong/soong_ui.bash --make-mode "${OUT_DIR}/host/${OS}-x86/bin/cuj_tests"
"${SOONG_OUT}/host/${OS}-x86/bin/cuj_tests" || true "${OUT_DIR}/host/${OS}-x86/bin/cuj_tests" || true
if [ -n "${DIST_DIR}" ]; then if [ -n "${DIST_DIR}" ]; then
cp -r "${OUT_DIR}/cuj_tests/logs" "${DIST_DIR}" cp -r "${OUT_DIR}/cuj_tests/logs" "${DIST_DIR}"

2
scripts/diff_build_graphs.sh
View file

@ -98,7 +98,7 @@ function run_build() {
# or in case it is affected by some of the changes we're testing # or in case it is affected by some of the changes we're testing
make blueprint_tools make blueprint_tools
# find multiproduct_kati and have it build the ninja files for each product # find multiproduct_kati and have it build the ninja files for each product
builder="$(echo $OUT_DIR/soong/host/*/bin/multiproduct_kati)" builder="$(echo $OUT_DIR/host/*/bin/multiproduct_kati)"
BUILD_NUMBER=sample "$builder" $PRODUCTS_ARG --keep --out "$OUT_DIR_TEMP" || true BUILD_NUMBER=sample "$builder" $PRODUCTS_ARG --keep --out "$OUT_DIR_TEMP" || true
echo echo
} }