From a94247c0719af58607f058598ffd1769d09040f0 Mon Sep 17 00:00:00 2001 From: Raaj Gopal Date: Mon, 8 Apr 2024 14:32:19 +0530 Subject: [PATCH] TP-63131: SO loader fix for hermes | master (#10354) Co-authored-by: Kshitij Ghongadi --- android/app/build.gradle | 3 +++ android/app/proguard-rules.pro | 4 +++- android/navi-base/build.gradle | 4 +++- android/navi_hl_dynamic/build.gradle | 4 +++- android/navi_pl_dynamic/build.gradle | 4 +++- 5 files changed, 15 insertions(+), 4 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 8685be8c5c..f1af59d86c 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -407,6 +407,9 @@ dependencies { kaptTest libs.dagger.hiltCompiler ksp libs.androidx.room.compiler + implementation("com.facebook.react:hermes-engine:+") { + exclude group:'com.facebook.fbjni' + } } kapt { diff --git a/android/app/proguard-rules.pro b/android/app/proguard-rules.pro index 4be6e56e26..08ce93de27 100644 --- a/android/app/proguard-rules.pro +++ b/android/app/proguard-rules.pro @@ -272,4 +272,6 @@ -keep,includedescriptorclasses class net.zetetic.database.** { *; } -keep,includedescriptorclasses interface net.zetetic.database.** { *; } --keep class androidx.lifecycle.SavedStateHandle { *; } \ No newline at end of file +-keep class androidx.lifecycle.SavedStateHandle { *; } +-keep class com.facebook.hermes.unicode.** { *; } +-keep class com.facebook.jni.** { *; } diff --git a/android/navi-base/build.gradle b/android/navi-base/build.gradle index 904635e1bb..e7f591b861 100644 --- a/android/navi-base/build.gradle +++ b/android/navi-base/build.gradle @@ -88,7 +88,9 @@ dependencies { implementation libs.joda.time implementation "com.facebook.react:react-android" - implementation "com.facebook.react:hermes-android" + implementation("com.facebook.react:hermes-engine:+") { + exclude group:'com.facebook.fbjni' + } androidTestImplementation libs.androidx.test.espresso.core androidTestImplementation libs.androidx.test.junit diff --git a/android/navi_hl_dynamic/build.gradle b/android/navi_hl_dynamic/build.gradle index 9d16f9badc..a48165b64e 100644 --- a/android/navi_hl_dynamic/build.gradle +++ b/android/navi_hl_dynamic/build.gradle @@ -89,7 +89,9 @@ dependencies { testImplementation libs.mockk implementation "com.facebook.react:react-android" - implementation "com.facebook.react:hermes-android" + implementation("com.facebook.react:hermes-engine:+") { + exclude group:'com.facebook.fbjni' + } } kapt { diff --git a/android/navi_pl_dynamic/build.gradle b/android/navi_pl_dynamic/build.gradle index 3778fa7d78..b85c212e14 100644 --- a/android/navi_pl_dynamic/build.gradle +++ b/android/navi_pl_dynamic/build.gradle @@ -84,5 +84,7 @@ dependencies { testImplementation libs.junit implementation "com.facebook.react:react-android" - implementation "com.facebook.react:hermes-android" + implementation("com.facebook.react:hermes-engine:+") { + exclude group:'com.facebook.fbjni' + } }