diff options
| author | Michael Bestas <mkbestas@lineageos.org> | 2021-11-15 22:18:04 +0200 |
|---|---|---|
| committer | Michael Bestas <mkbestas@lineageos.org> | 2021-12-09 01:22:10 +0200 |
| commit | d4c47bf0b8fe9db60f80a28b0f5948f7c2fb1fec (patch) | |
| tree | be864c2290806309694a48165871f50315135c5e | |
| parent | acaaa7b60ea10dafc3fc9f530077e7c254f21cc2 (diff) | |
extract_utils: Automatically add apk/jar/vintf fragments to PRODUCT_PACKAGES
Change-Id: I9d12e00c294d02b40fde2b66d7797f69f6504c35
| -rw-r--r-- | extract_utils.sh | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/extract_utils.sh b/extract_utils.sh index c8e0755..ccdb9d2 100644 --- a/extract_utils.sh +++ b/extract_utils.sh @@ -1119,6 +1119,13 @@ function parse_file_list() { 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") @@ -1762,11 +1769,7 @@ function generate_prop_list_from_image() { 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 |