Skip to content

Commit d657c97

Browse files
Add rn-tester Android BUCK configuration (#39987)
Summary: Changelog: [Internal] Reviewed By: fkgozali Differential Revision: D49983211
1 parent 44f5989 commit d657c97

File tree

5 files changed

+12
-5
lines changed

5 files changed

+12
-5
lines changed

packages/react-native/ReactCommon/react/bridging/Object.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ struct Bridging<
3131
std::shared_ptr<T>,
3232
std::enable_if_t<std::is_base_of_v<jsi::HostObject, T>>> {
3333
static std::shared_ptr<T> fromJs(jsi::Runtime& rt, const jsi::Object& value) {
34-
return value.asHostObject<T>(rt);
34+
return value.getHostObject<T>(rt);
3535
}
3636

3737
static jsi::Object toJs(jsi::Runtime& rt, std::shared_ptr<T> value) {

packages/rn-tester/android/app/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,8 @@ android {
146146
versionName "1.0"
147147
testBuildType System.getProperty('testBuildType', 'debug') // This will later be used to control the test apk build type
148148
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
149+
buildConfigField("String", "JS_MAIN_MODULE_NAME", "\"js/RNTesterApp.android\"")
150+
buildConfigField("String", "BUNDLE_ASSET_NAME", "\"RNTesterApp.android.bundle\"")
149151
}
150152
externalNativeBuild {
151153
cmake {

packages/rn-tester/android/app/src/main/AndroidManifest.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest
3+
package="com.facebook.react.uiapp"
34
xmlns:android="http://schemas.android.com/apk/res/android">
45

56
<uses-feature
@@ -15,6 +16,10 @@
1516
android:name="android.hardware.camera"
1617
android:required="false" />
1718

19+
<uses-sdk
20+
android:minSdkVersion="23"
21+
android:targetSdkVersion="34" />
22+
1823
<uses-permission android:name="android.permission.INTERNET" />
1924
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
2025
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>

packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ class RNTesterApplication : Application(), ReactApplication {
4343
throw RuntimeException("Should not use ReactNativeHost when Bridgeless enabled")
4444
}
4545
object : DefaultReactNativeHost(this) {
46-
public override fun getJSMainModuleName(): String = "js/RNTesterApp.android"
46+
public override fun getJSMainModuleName(): String = BuildConfig.JS_MAIN_MODULE_NAME
4747

48-
public override fun getBundleAssetName(): String = "RNTesterApp.android.bundle"
48+
public override fun getBundleAssetName(): String = BuildConfig.BUNDLE_ASSET_NAME
4949

5050
override fun getUseDeveloperSupport(): Boolean = BuildConfig.DEBUG
5151

packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterReactHostDelegate.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ import com.facebook.react.uimanager.ViewManager
3939
class RNTesterReactHostDelegate internal constructor(context: Context) : ReactHostDelegate {
4040
var reactHost: ReactHostImpl? = null
4141

42-
override val jsMainModulePath: String = "js/RNTesterApp.android"
42+
override val jsMainModulePath: String = BuildConfig.JS_MAIN_MODULE_NAME
4343

4444
override val jsBundleLoader: JSBundleLoader =
45-
JSBundleLoader.createAssetLoader(context, "assets://RNTesterApp.android.bundle", true)
45+
JSBundleLoader.createAssetLoader(context, "assets:" + BuildConfig.BUNDLE_ASSET_NAME, true)
4646

4747
@get:Synchronized override val bindingsInstaller: BindingsInstaller? = null
4848

0 commit comments

Comments
 (0)