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

Commit 8f6c9e41 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Speed up m command autocompletion" am: a56bce6e am: 5a69b098 am: 0cf6244e 

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



Change-Id: I3dc0232f274ac129f0d04da9dca202d5fb3cf510
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 76bff213 0cf6244e

core/tasks/module-info.mk

+6 −0
Original line number Diff line number Diff line
@@ -41,3 +41,9 @@ droidcore-unbundled: $(MODULE_INFO_JSON) 


$(call dist-for-goals, general-tests, $(MODULE_INFO_JSON))

$(call dist-for-goals, droidcore-unbundled, $(MODULE_INFO_JSON))



# On every build, generate an all_modules.txt file to be used for autocompleting

# the m command. After timing this using $(shell date +"%s.%3N"), it only adds

# 0.01 seconds to the internal master build, and will only rerun on builds that

# rerun kati.

$(file >$(PRODUCT_OUT)/all_modules.txt,$(subst $(space),$(newline),$(ALL_MODULES)))

envsetup.sh

+4 −6
Original line number Diff line number Diff line
@@ -1551,12 +1551,10 @@ function verifymodinfo() { 
    fi

}



# List all modules for the current device, as cached in module-info.json. If any build change is

# made and it should be reflected in the output, you should run 'refreshmod' first.

# List all modules for the current device, as cached in all_modules.txt. If any build change is

# made and it should be reflected in the output, you should run `m nothing` first.

function allmod() {

    verifymodinfo || return 1



    python3 -c "import json; print('\n'.join(sorted(json.load(open('$ANDROID_PRODUCT_OUT/module-info.json')).keys())))"

    cat $ANDROID_PRODUCT_OUT/all_modules.txt 2>/dev/null

}



# Return the Bazel label of a Soong module if it is converted with bp2build.
@@ -1735,7 +1733,7 @@ function installmod() { 


function _complete_android_module_names() {

    local word=${COMP_WORDS[COMP_CWORD]}

    COMPREPLY=( $(QUIET_VERIFYMODINFO=true allmod | grep -E "^$word") )

    COMPREPLY=( $(allmod | grep -E "^$word") )

}



# Print colored exit condition