commit acdcaa06dcaff4d8b106247d1abc11f5f326bce7
author Jingwen Chen <jingwen@google.com> Thu Oct 13 07:24:24 2022 +0000
committer Jingwen Chen <jingwen@google.com> Wed Oct 26 13:10:23 2022 +0000
tree 93e8060b6987ff85474ce5605ffceb09cd784f61
parent f1e9574f97d7ba361cd12c9c7ada86ec5855aeb5

Make bmod compatible with custom $OUT_DIR.

Bug: 251436403

Change-Id: I00fc4af05b0b2f5b4f859deaf04d9e586a5e3c59

envsetup.sh

diff --git a/envsetup.sh b/envsetup.sh
index 2ff068d..3674a4a 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -1573,9 +1573,9 @@
     #
     # For a snappy result, use the latest generated version in soong_injection,
     # and ask users to run m bp2build if it doesn't exist.
-    converted_json="out/soong/soong_injection/metrics/converted_modules_path_map.json"
+    converted_json="$(get_abs_build_var OUT_DIR)/soong/soong_injection/metrics/converted_modules_path_map.json"
 
-    if [ ! -f $(gettop)/${converted_json} ]; then
+    if [ ! -f ${converted_json} ]; then
       echo "bp2build files not found. Have you ran 'm bp2build'?" >&2
       return 1
     fi
@@ -1980,13 +1980,7 @@
             return
             ;;
     esac
-    if [[ -z "$OUT_DIR" ]]; then
-      if [[ -z "$OUT_DIR_COMMON_BASE" ]]; then
-        OUT_DIR=out
-      else
-        OUT_DIR=${OUT_DIR_COMMON_BASE}/${PWD##*/}
-      fi
-    fi
+    OUT_DIR="$(get_abs_build_var OUT_DIR)"
     if [[ "$1" == "--regenerate" ]]; then
       shift 1
       NINJA_ARGS="-t commands $@" m