commit 98a88503eebe5215061681db658f9191e6d8f88c
author Victor Hsieh <victorhsieh@google.com> Mon Oct 29 16:54:23 2018 -0700
committer Victor Hsieh <victorhsieh@google.com> Mon Oct 29 16:55:06 2018 -0700
tree 89fe76cf8531a30e2c8fa2b1f50b9ae796de8c37
parent a33cf14752f3c419a81231ac97a46ba047faf50c

adb install-multiple to also accept .fsv_sig

.fsv_sig will be fs-verity signature in PKCS#7 format.

Test: adb install-multiple foo.apk foo.apk.fsv_sig
Bug: 112037636
Change-Id: I4a9b2203334d4974602c7f138222ade1aa319ccb

adb/client/adb_install.cpp

diff --git a/adb/client/adb_install.cpp b/adb/client/adb_install.cpp
index cf22efa..0008f72 100644
--- a/adb/client/adb_install.cpp
+++ b/adb/client/adb_install.cpp
@@ -392,7 +392,8 @@
         }
 
         if (android::base::EndsWithIgnoreCase(file, ".apk") ||
-            android::base::EndsWithIgnoreCase(file, ".dm")) {
+            android::base::EndsWithIgnoreCase(file, ".dm") ||
+            android::base::EndsWithIgnoreCase(file, ".fsv_sig")) {
             struct stat sb;
             if (stat(file, &sb) != -1) total_size += sb.st_size;
             first_apk = i;