commit ea90aef8da4ec915db0508bbce09b70c3738daa8
author Michael Bestas <mkbestas@lineageos.org> Mon Nov 15 22:18:04 2021 +0200
committer micky387 <mickaelsaibi@free.fr> Mon Apr 22 07:51:40 2024 -0400
tree a3e9526aaf538ef180c3583a5c74ffaf8a089456
parent 13738a82b9805795cee2e1f41690fd0021f15227

extract_utils: Automatically add apk/jar/vintf fragments to PRODUCT_PACKAGES

Change-Id: I9d12e00c294d02b40fde2b66d7797f69f6504c35

build/tools/extract_utils.sh

diff --git a/build/tools/extract_utils.sh b/build/tools/extract_utils.sh
index 770bb9b..7120ca2 100755
--- a/build/tools/extract_utils.sh
+++ b/build/tools/extract_utils.sh
@@ -965,6 +965,13 @@
             PRODUCT_PACKAGES_LIST+=("${SPEC#-}")
             PRODUCT_PACKAGES_HASHES+=("$HASH")
             PRODUCT_PACKAGES_FIXUP_HASHES+=("$FIXUP_HASH")
+        # if line contains apk, jar or vintf fragment, it needs to be packaged
+        elif suffix_match_file ".apk" "$(src_file "$SPEC")" || \
+             suffix_match_file ".jar" "$(src_file "$SPEC")" || \
+             [[ "$SPEC" == *"etc/vintf/manifest/"* ]]; then
+            PRODUCT_PACKAGES_LIST+=("$SPEC")
+            PRODUCT_PACKAGES_HASHES+=("$HASH")
+            PRODUCT_PACKAGES_FIXUP_HASHES+=("$FIXUP_HASH")
         else
             PRODUCT_COPY_FILES_LIST+=("$SPEC")
             PRODUCT_COPY_FILES_HASHES+=("$HASH")
@@ -1856,11 +1863,7 @@
         if array_contains "$FILE" "${skipped_vendor_files[@]}"; then
             continue
         fi
-        if suffix_match_file ".apk" "$FILE" ; then
-            echo "-vendor/$FILE" >> "$output_list_tmp"
-        else
-            echo "vendor/$FILE" >> "$output_list_tmp"
-        fi
+        echo "vendor/$FILE" >> "$output_list_tmp"
     done
 
     # Sort merged file with all lists