From 4cf566559be8e3bb4732ce32ef11da04e52c8023 Mon Sep 17 00:00:00 2001
From: Adrian Catana <adicatana@meta.com>
Date: Tue, 7 Nov 2023 11:01:26 -0800
Subject: [PATCH] Recover from more general errors as well

Summary: Will generalise this in a future diff to rely on the type of the SoSource that failed, but let's recover from /mnt/ errors as well.

Reviewed By: michalgr

Differential Revision: D50320566

fbshipit-source-id: 4325e5f49f2321c5dee78e1c11407e3fe084b866
---
 .../com/facebook/soloader/recovery/ReunpackBackupSoSources.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/com/facebook/soloader/recovery/ReunpackBackupSoSources.java b/java/com/facebook/soloader/recovery/ReunpackBackupSoSources.java
index e95aef2..7b15045 100644
--- a/java/com/facebook/soloader/recovery/ReunpackBackupSoSources.java
+++ b/java/com/facebook/soloader/recovery/ReunpackBackupSoSources.java
@@ -46,7 +46,7 @@ public boolean recover(UnsatisfiedLinkError error, SoSource[] soSources) {
 
     SoLoaderULError err = (SoLoaderULError) error;
     String message = err.getMessage();
-    if (message == null || !message.contains("/data/app")) {
+    if (message == null || (!message.contains("/app/") && !message.contains("/mnt/"))) {
       // Do not attempt to recovery if the DSO wasn't in the data/app directory
       return false;
     }