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

Commit 594c3fc3 authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Fix all_named_products, remove kati_all_products 

all_named_products was giving the file path instead of product name for
the name:path format of PRODUCT_MAKEFILES.

kati_all_products has been replaced with multiproduct_kati

Test: get_build_var all_named_products
Test: multiproduct_kati
Change-Id: I24015ef0778ac7cd45201aa55c1737b0553f09fe
parent 353a659a

core/product_config.mk

+1 −1
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ $(foreach f, $(all_product_configs),\ 
    $(eval _cpm_word2 := $(word 2,$(_cpm_words)))\

    $(if $(_cpm_word2),\

        $(eval all_product_makefiles += $(_cpm_word2))\

        $(eval all_named_products += $(_cpm_word2))\

        $(eval all_named_products += $(_cpm_word1))\

        $(if $(filter $(TARGET_PRODUCT),$(_cpm_word1)),\

            $(eval current_product_makefile += $(_cpm_word2)),),\

        $(eval all_product_makefiles += $(f))\

tools/kati_all_products.sh

deleted100755 → 0
+0 −7
Original line number Diff line number Diff line 
#!/bin/bash -e



cd $ANDROID_BUILD_TOP

mkdir -p out.kati

source build/envsetup.sh



get_build_var all_named_products | sed "s/ /\n/g" | parallel "$@" --progress "(source build/envsetup.sh; lunch {}-eng && m -j OUT_DIR=out.kati/{} out.kati/{}/build-{}.ninja) >out.kati/log.{} 2>&1"