Add rn-tester Android BUCK configuration (#39987)

Summary: Pull Request resolved: #39987 Changelog: [Internal] Reviewed By: fkgozali Differential Revision: D49983211 fbshipit-source-id: c362d5b93e159bfb5ca17bea0ec0484adcdb4dca
facebook · Oct 11, 2023 · 9e3d466 · 9e3d466
1 parent b13ea17
commit 9e3d466
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/packages/react-native/ReactCommon/react/bridging/Object.h b/packages/react-native/ReactCommon/react/bridging/Object.h
@@ -31,7 +31,7 @@ struct Bridging<
     std::shared_ptr<T>,
     std::enable_if_t<std::is_base_of_v<jsi::HostObject, T>>> {
   static std::shared_ptr<T> fromJs(jsi::Runtime& rt, const jsi::Object& value) {
-    return value.asHostObject<T>(rt);
+    return value.getHostObject<T>(rt);
   }
 
   static jsi::Object toJs(jsi::Runtime& rt, std::shared_ptr<T> value) {

diff --git a/packages/rn-tester/android/app/build.gradle b/packages/rn-tester/android/app/build.gradle
@@ -146,6 +146,8 @@ android {
         versionName "1.0"
         testBuildType System.getProperty('testBuildType', 'debug')  // This will later be used to control the test apk build type
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
+        buildConfigField("String", "JS_MAIN_MODULE_NAME", "\"js/RNTesterApp.android\"")
+        buildConfigField("String", "BUNDLE_ASSET_NAME", "\"RNTesterApp.android.bundle\"")
     }
     externalNativeBuild {
         cmake {

diff --git a/packages/rn-tester/android/app/src/main/AndroidManifest.xml b/packages/rn-tester/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
+  package="com.facebook.react.uiapp"
   xmlns:android="http://schemas.android.com/apk/res/android">
 
   <uses-feature
@@ -15,6 +16,10 @@
     android:name="android.hardware.camera"
     android:required="false" />
 
+  <uses-sdk
+      android:minSdkVersion="23"
+      android:targetSdkVersion="34" />
+
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
   <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>

diff --git a/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.kt b/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.kt
@@ -43,9 +43,9 @@ class RNTesterApplication : Application(), ReactApplication {
       throw RuntimeException("Should not use ReactNativeHost when Bridgeless enabled")
     }
     object : DefaultReactNativeHost(this) {
-      public override fun getJSMainModuleName(): String = "js/RNTesterApp.android"
+      public override fun getJSMainModuleName(): String = BuildConfig.JS_MAIN_MODULE_NAME
 
-      public override fun getBundleAssetName(): String = "RNTesterApp.android.bundle"
+      public override fun getBundleAssetName(): String = BuildConfig.BUNDLE_ASSET_NAME
 
       override fun getUseDeveloperSupport(): Boolean = BuildConfig.DEBUG
 

diff --git a/...rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterReactHostDelegate.kt b/...rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterReactHostDelegate.kt
@@ -39,10 +39,10 @@ import com.facebook.react.uimanager.ViewManager
 class RNTesterReactHostDelegate internal constructor(context: Context) : ReactHostDelegate {
   var reactHost: ReactHostImpl? = null
 
-  override val jsMainModulePath: String = "js/RNTesterApp.android"
+  override val jsMainModulePath: String = BuildConfig.JS_MAIN_MODULE_NAME
 
   override val jsBundleLoader: JSBundleLoader =
-      JSBundleLoader.createAssetLoader(context, "assets://RNTesterApp.android.bundle", true)
+      JSBundleLoader.createAssetLoader(context, "assets:" + BuildConfig.BUNDLE_ASSET_NAME, true)
 
   @get:Synchronized override val bindingsInstaller: BindingsInstaller? = null