[android] Support caching prebuilt hermes-engine

expo · Apr 8, 2024 · 546eb41 · 546eb41
1 parent def653d
commit 546eb41
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/packages/react-native/ReactAndroid/build.gradle.kts b/packages/react-native/ReactAndroid/build.gradle.kts
@@ -502,6 +502,8 @@ android {
     ndkVersion = libs.versions.ndkVersion.get()
   }
 
+  resourcePrefix = "reactandroid_"
+
   compileOptions {
     sourceCompatibility = JavaVersion.VERSION_17
     targetCompatibility = JavaVersion.VERSION_17
@@ -768,6 +770,13 @@ dependencies {
   compileOnly(libs.javax.annotation.api)
   api(libs.javax.inject)
 
+  if (!buildHermesSource) {
+      debugCompileOnly(files("${prebuiltHermesDir}/hermes-engine-debug.aar"))
+      releaseCompileOnly(files("${prebuiltHermesDir}/hermes-engine-release.aar"))
+  } else {
+      compileOnly(project(":packages:react-native:ReactAndroid:hermes-engine"))
+  }
+
   // It's up to the consumer to decide if hermes should be included or not.
   // Therefore hermes-engine is a compileOnly dependency.
   compileOnly(project(":packages:react-native:ReactAndroid:hermes-engine"))

diff --git a/packages/react-native/ReactAndroid/src/main/res/devsupport/values-es/strings.xml b/packages/react-native/ReactAndroid/src/main/res/devsupport/values-es/strings.xml
@@ -3,12 +3,6 @@
 <!-- @generated -->
 <!-- FB Locale: es_LA -->
 <resources exclude-from-buck-resource-map="true">
-<<<<<<< HEAD
-||||||| parent of 6b77155168f ([ReactAndroid] Prefix all resources with 'reactandroid_')
-    <string name="catalyst_dev_menu_header" gender="unknown">Menú de desarrollador nativo de reacción (%1$s)</string>
-    <string name="catalyst_dev_menu_sub_header" gender="unknown">Se está ejecutando %1$s</string>
-=======
     <string name="reactandroid_catalyst_dev_menu_header" gender="unknown">Menú de desarrollador nativo de reacción (%1$s)</string>
     <string name="reactandroid_catalyst_dev_menu_sub_header" gender="unknown">Se está ejecutando %1$s</string>
->>>>>>> 6b77155168f ([ReactAndroid] Prefix all resources with 'reactandroid_')
 </resources>