Merge changes from topic "punch_shared_libs" into main

* changes:
  Adding FileSystemUtils test
  Punch holes in 64 bit native libs
  Add method to return Zip file name

1 files changed, 4 insertions, 0 deletions

diff --git a/libs/androidfw/ZipFileRO.cpp b/libs/androidfw/ZipFileRO.cpp
index 9d4b426a6759..34a6bc27b93f 100644
--- a/libs/androidfw/ZipFileRO.cpp
+++ b/libs/androidfw/ZipFileRO.cpp
@@ -310,3 +310,7 @@ bool ZipFileRO::uncompressEntry(ZipEntryRO entry, int fd) const
 
     return true;
 }
+
+const char* ZipFileRO::getZipFileName() {
+    return mFileName;
+}