Ver código fonte

Fix location of host tools

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
Colin Cross 2 anos atrás
pai
commit
6a4d3ba138
3 arquivos alterados com 4 adições e 5 exclusões
  1. 1 1
      build_kzip.bash
  2. 2 3
      cuj/run_cuj_tests.sh
  3. 1 1
      scripts/diff_build_graphs.sh

+ 1 - 1
build_kzip.bash

@@ -61,5 +61,5 @@ declare -r kzip_count=$(find "$out" -name '*.kzip' | wc -l)
 # Pack
 # TODO(asmundak): this should be done by soong.
 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')
 

+ 2 - 3
cuj/run_cuj_tests.sh

@@ -18,11 +18,10 @@ readonly ANDROID_TOP="$(cd $(dirname $0)/../../..; pwd)"
 cd "$ANDROID_TOP"
 
 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
   cp -r "${OUT_DIR}/cuj_tests/logs" "${DIST_DIR}"

+ 1 - 1
scripts/diff_build_graphs.sh

@@ -98,7 +98,7 @@ function run_build() {
   # or in case it is affected by some of the changes we're testing
   make blueprint_tools
   # 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
   echo
 }