extract_utils: fix generating system/bin & system/etc blueprint

Previously the wrong variables were checked to see if the prefix
matches, so e.g. no cc_prebuilt_binary were generated for those
binaries.

Change-Id: I744c6f6a4584921a26547478ac14a160c56e07b7
This commit is contained in:
Luca Weiss
2022-09-27 14:52:41 +02:00
parent 929c9b99ec
commit 04563775b3

View File

@@ -782,7 +782,7 @@ function write_product_packages() {
write_blueprint_packages "ETC" "" "" "ETC" >> "$ANDROIDBP"
fi
local S_ETC=( $(prefix_match "system/etc/") )
if [ "${#ETC[@]}" -gt "0" ]; then
if [ "${#S_ETC[@]}" -gt "0" ]; then
write_blueprint_packages "ETC" "system" "" "S_ETC" >> "$ANDROIDBP"
fi
local V_ETC=( $(prefix_match "vendor/etc/") )
@@ -808,7 +808,7 @@ function write_product_packages() {
write_blueprint_packages "EXECUTABLES" "" "" "BIN" >> "$ANDROIDBP"
fi
local S_BIN=( $(prefix_match "system/bin/") )
if [ "${#BIN[@]}" -gt "0" ]; then
if [ "${#S_BIN[@]}" -gt "0" ]; then
write_blueprint_packages "EXECUTABLES" "system" "" "S_BIN" >> "$ANDROIDBP"
fi
local V_BIN=( $(prefix_match "vendor/bin/") )