From 46b6e3a4544b648b8b7a86d6dbd771393029a221 Mon Sep 17 00:00:00 2001
From: Alessandro Astone <ales.astone@gmail.com>
Date: Fri, 4 Dec 2020 01:04:01 +0100
Subject: [PATCH] extract_utils: generate_prop_list: Ignore vdex/odex files too

Change-Id: Ibe77e8b93466a71d4d0c48ca8f4ff2e00c6e40af
(cherry picked from commit ee669788bc86330215f2444b3beb1f3870329c9e)
---
 build/tools/extract_utils.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/build/tools/extract_utils.sh b/build/tools/extract_utils.sh
index 7c810236..2cc8983e 100644
--- a/build/tools/extract_utils.sh
+++ b/build/tools/extract_utils.sh
@@ -1818,6 +1818,9 @@ function generate_prop_list_from_image() {
 
     find "$image_dir" -not -type d | sed "s#^$image_dir/##" | while read -r FILE
     do
+        if suffix_match_file ".odex" "$FILE" || suffix_match_file ".vdex" "$FILE" ; then
+            continue
+        fi
         # Skip VENDOR_SKIP_FILES since it will be re-generated at build time
         if array_contains "$FILE" "${VENDOR_SKIP_FILES[@]}"; then
             continue