summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Bestas <mkbestas@lineageos.org>2021-12-02 20:58:40 +0200
committerMichael Bestas <mkbestas@lineageos.org>2021-12-09 01:40:34 +0200
commit3e6a2fe5ebdf8915ed06c78095321e2a895985c3 (patch)
tree1c60de85f796af76fd9a63901aa617dd2aad5696
parent4af145c186a1c6a05d430ef1a52a23c6308bf9c7 (diff)
regen-vendor: Allow proprietary list generation for all partitions
Change-Id: I7fa77cc0406e47b2553ea20f8eb527fd3f7a0296
-rw-r--r--extract_utils.sh11
1 files changed, 8 insertions, 3 deletions
diff --git a/extract_utils.sh b/extract_utils.sh
index f06d3c6..c60b376 100644
--- a/extract_utils.sh
+++ b/extract_utils.sh
@@ -1805,7 +1805,8 @@ function generate_prop_list_from_image() {
local image_dir="$TMPDIR/image-temp"
local output_list="$2"
local output_list_tmp="$TMPDIR/_proprietary-blobs.txt"
- local -n skipped_vendor_files="$3"
+ local -n skipped_files="$3"
+ local partition="$4"
extract_img_data "$image_file" "$image_dir"
@@ -1815,10 +1816,14 @@ function generate_prop_list_from_image() {
continue
fi
# Skip device defined skipped files since they will be re-generated at build time
- if array_contains "$FILE" "${skipped_vendor_files[@]}"; then
+ if array_contains "$FILE" "${skipped_files[@]}"; then
continue
fi
- echo "vendor/$FILE" >> "$output_list_tmp"
+ if [ -z "$partition" ]; then
+ echo "vendor/$FILE" >> "$output_list_tmp"
+ else
+ echo "$partition/$FILE" >> "$output_list_tmp"
+ fi
done
# Sort merged file with all lists