StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Obsolete add_lunch_combo

Browse Source 
Bug: 77599627
Test: source build/envsetup.sh with add_lunch_combo calls in bash & zsh
Change-Id: If12b41d8f9a2f56efdb64ad0dccc25a1e342fdd1
This commit is contained in:
Dan Willemsen
2019-02-11 21:31:47 -08:00
parent 1b082c3e05
commit 5436c7e583
2 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/product.mk
View File

@@ -92,7 +92,7 @@ $(sort \
) \ ) \
$(eval PRODUCT_MAKEFILES :=) \ $(eval PRODUCT_MAKEFILES :=) \
$(eval LOCAL_DIR :=) \ $(eval LOCAL_DIR :=) \
$(eval COMMON_LUNCH_CHOICES := $(sort $(_COMMON_LUNCH_CHOICES) $(LUNCH_MENU_CHOICES))) \ $(eval COMMON_LUNCH_CHOICES := $(sort $(_COMMON_LUNCH_CHOICES))) \
$(eval _COMMON_LUNCH_CHOICES :=) \ $(eval _COMMON_LUNCH_CHOICES :=) \
) )
endef endef

23
envsetup.sh
View File

@@ -548,19 +548,14 @@ function choosecombo()
destroy_build_var_cache destroy_build_var_cache
} }
# Clear this variable. It will be built up again when the vendorsetup.sh
# files are included at the end of this file.
unset LUNCH_MENU_CHOICES
function add_lunch_combo() function add_lunch_combo()
{ {
local new_combo=$1 if [ -n "$ZSH_VERSION" ]; then
local c echo -n "${funcfiletrace[1]}: "
for c in ${LUNCH_MENU_CHOICES[@]} ; do else
if [ "$new_combo" = "$c" ] ; then echo -n "${BASH_SOURCE[1]}:${BASH_LINENO[0]}: "
return fi
fi echo "add_lunch_combo is obsolete. Use COMMON_LUNCH_CHOICES in your AndroidProducts.mk instead."
done
LUNCH_MENU_CHOICES=(${LUNCH_MENU_CHOICES[@]} $new_combo)
} }
function print_lunch_menu() function print_lunch_menu()
@@ -573,7 +568,7 @@ function print_lunch_menu()
local i=1 local i=1
local choice local choice
for choice in $(TARGET_BUILD_APPS= LUNCH_MENU_CHOICES="${LUNCH_MENU_CHOICES[@]}" get_build_var COMMON_LUNCH_CHOICES) for choice in $(TARGET_BUILD_APPS= get_build_var COMMON_LUNCH_CHOICES)
do do
echo " $i. $choice" echo " $i. $choice"
i=$(($i+1)) i=$(($i+1))
@@ -601,7 +596,7 @@ function lunch()
selection=aosp_arm-eng selection=aosp_arm-eng
elif (echo -n $answer | grep -q -e "^[0-9][0-9]*$") elif (echo -n $answer | grep -q -e "^[0-9][0-9]*$")
then then
local choices=($(TARGET_BUILD_APPS= LUNCH_MENU_CHOICES="${LUNCH_MENU_CHOICES[@]}" get_build_var COMMON_LUNCH_CHOICES)) local choices=($(TARGET_BUILD_APPS= get_build_var COMMON_LUNCH_CHOICES))
if [ $answer -le ${#choices[@]} ] if [ $answer -le ${#choices[@]} ]
then then
# array in zsh starts from 1 instead of 0. # array in zsh starts from 1 instead of 0.
@@ -671,7 +666,7 @@ function _lunch()
prev="${COMP_WORDS[COMP_CWORD-1]}" prev="${COMP_WORDS[COMP_CWORD-1]}"
if [ -z "$COMMON_LUNCH_CHOICES_CACHE" ]; then if [ -z "$COMMON_LUNCH_CHOICES_CACHE" ]; then
COMMON_LUNCH_CHOICES_CACHE=$(TARGET_BUILD_APPS= LUNCH_MENU_CHOICES="${LUNCH_MENU_CHOICES[@]}" get_build_var COMMON_LUNCH_CHOICES) COMMON_LUNCH_CHOICES_CACHE=$(TARGET_BUILD_APPS= get_build_var COMMON_LUNCH_CHOICES)
fi fi
COMPREPLY=( $(compgen -W "${COMMON_LUNCH_CHOICES_CACHE}" -- ${cur}) ) COMPREPLY=( $(compgen -W "${COMMON_LUNCH_CHOICES_CACHE}" -- ${cur}) )