Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a4703b6 authored by Jingwen Chen's avatar Jingwen Chen Committed by Automerger Merge Worker
Browse files

Merge "Support multiple module name queries with bmod." into main am:...

Merge "Support multiple module name queries with bmod." into main am: 8b87a546 am: 6972c5f0 am: 8a40f440

Original change: https://android-review.googlesource.com/c/platform/build/+/2787539



Change-Id: Ib11665157f78d37d08f88861003ac25580373479
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a4e25c19 8a40f440
Loading
Loading
Loading
Loading
+18 −13
Original line number Diff line number Diff line
@@ -1613,8 +1613,8 @@ function allmod() {
# Return the Bazel label of a Soong module if it is converted with bp2build.
function bmod()
(
    if [ $# -ne 1 ]; then
        echo "usage: bmod <module>" >&2
    if [ $# -eq 0 ]; then
        echo "usage: bmod <module 1> <module 2> ... <module n>" >&2
        return 1
    fi

@@ -1631,19 +1631,24 @@ function bmod()
      return 1
    fi

    local target_label=$(python3 -c "import json
module = '$1'
    modules=()
    for m in "$@"; do
        modules+=("\"$m\",")
    done
    local res=$(python3 -c "import json
modules = [${modules[*]}]
converted_json='$converted_json'
bp2build_converted_map = json.load(open(converted_json))
for module in modules:
    if module not in bp2build_converted_map:
    exit(1)
        print(module + ' is not converted to Bazel.')
    else:
        print(bp2build_converted_map[module] + ':' + module)")

    if [ -z "${target_label}" ]; then
      echo "$1 is not converted to Bazel." >&2
    echo "${res}"
    unconverted_count=$(echo "${res}" | grep -c "not converted to Bazel")
    if [[ ${unconverted_count} -ne 0 ]]; then
        return 1
    else
      echo "${target_label}"
    fi
)