Skip to content

Commit 669c1f1

Browse files
HeyImChrisHeyImChris
authored
Merge pull request #10 from amgleitman/amgleitman/fb66merge-fix-android-patches
Fix Android patches in fb66merge
2 parents a2e1a05 + a90c149 commit 669c1f1

File tree

36 files changed

+150
-191
lines changed

36 files changed

+150
-191
lines changed

‎android-patches/patches/Build/ReactAndroid/NuGet.Config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- "E:\\github\\rnm-63-fresh\\ReactAndroid\\NuGet.Config" 1969-12-31 16:00:00.000000000 -0800
2-
+++ "E:\\github\\rnm-63\\ReactAndroid\\NuGet.Config" 2020-10-13 21:24:33.415491000 -0700
1+
--- /dev/null 2022-01-12 17:14:59.000000000 -0800
2+
+++ /var/folders/vs/8_b205053dddbcv7btj0w0v80000gn/T/update-1h8V3n/merge/Build/ReactAndroid/NuGet.Config 2022-01-12 15:04:31.000000000 -0800
33
@@ -0,0 +1,13 @@
44
+<?xml version="1.0" encoding="utf-8"?>
55
+<configuration>

‎android-patches/patches/Build/ReactAndroid/ReactAndroid.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- "E:\\gh\\react-native-macos2\\ReactAndroid\\ReactAndroid.nuspec" 1969-12-31 16:00:00.000000000 -0800
2-
+++ "E:\\gh\\react-native-macos\\ReactAndroid\\ReactAndroid.nuspec" 2021-10-16 13:47:24.356639200 -0700
1+
--- /dev/null 2022-01-12 17:14:59.000000000 -0800
2+
+++ /var/folders/vs/8_b205053dddbcv7btj0w0v80000gn/T/update-1h8V3n/merge/Build/ReactAndroid/ReactAndroid.nuspec 2022-01-12 15:04:31.000000000 -0800
33
@@ -0,0 +1,242 @@
44
+<?xml version="1.0" encoding="utf-8"?>
55
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">

‎android-patches/patches/Build/ReactAndroid/build.gradle

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
--- "E:\\github\\rnm-63-fresh\\ReactAndroid\\build.gradle" 2020-10-27 20:26:16.652167500 -0700
2-
+++ "E:\\github\\rnm-63\\ReactAndroid\\build.gradle" 2020-10-13 22:03:22.833541000 -0700
3-
@@ -43,6 +43,8 @@
1+
--- ./ReactAndroid/build.gradle 2022-01-11 17:41:28.000000000 -0800
2+
+++ /var/folders/vs/8_b205053dddbcv7btj0w0v80000gn/T/update-1h8V3n/merge/Build/ReactAndroid/build.gradle 2022-01-12 15:51:37.000000000 -0800
3+
@@ -39,6 +39,8 @@
44
// and the build will use that.
55
def boostPath = dependenciesPath ?: System.getenv("REACT_NATIVE_BOOST_PATH")
66

@@ -9,7 +9,7 @@
99
// Setup build type for NDK, supported values: {debug, release}
1010
def nativeBuildType = System.getenv("NATIVE_BUILD_TYPE") ?: "release"
1111

12-
@@ -92,11 +94,22 @@
12+
@@ -89,11 +91,22 @@
1313
dest(new File(downloadsDir, "folly-${FOLLY_VERSION}.tar.gz"))
1414
}
1515

@@ -32,7 +32,7 @@
3232
includeEmptyDirs = false
3333
into("$thirdPartyNdkDir/folly")
3434
}
35-
@@ -119,6 +132,14 @@
35+
@@ -161,6 +174,14 @@
3636
into "$thirdPartyNdkDir/hermes"
3737
}
3838

@@ -47,32 +47,32 @@
4747
task downloadGlog(dependsOn: createNativeDepsDirectories, type: Download) {
4848
src("https://github.com/google/glog/archive/v${GLOG_VERSION}.tar.gz")
4949
onlyIfNewer(true)
50-
@@ -303,7 +324,7 @@
50+
@@ -354,7 +375,7 @@
5151
}
5252

5353
def buildReactNdkLib = tasks.register("buildReactNdkLib", Exec) {
54-
- dependsOn(prepareJSC, prepareHermes, prepareBoost, prepareDoubleConversion, prepareFolly, prepareGlog, extractAARHeaders, extractJNIFiles)
55-
+ dependsOn(prepareJSC, prepareHermes, prepareV8, prepareBoost, prepareDoubleConversion, prepareFolly, prepareGlog, extractAARHeaders, extractJNIFiles)
54+
- dependsOn(prepareJSC, prepareHermes, prepareBoost, prepareDoubleConversion, prepareFmt, prepareFolly, prepareGlog, prepareLibevent, extractAARHeaders, extractJNIFiles)
55+
+ dependsOn(prepareJSC, prepareHermes, prepareV8, prepareBoost, prepareDoubleConversion, prepareFmt, prepareFolly, prepareGlog, prepareLibevent, extractAARHeaders, extractJNIFiles)
5656
dependsOn("generateCodegenArtifactsFromSchema");
57-
57+
5858
inputs.dir("$projectDir/../ReactCommon")
59-
@@ -314,6 +335,7 @@
59+
@@ -370,6 +391,7 @@
6060
"NDK_OUT=" + temporaryDir,
6161
"NDK_LIBS_OUT=$buildDir/react-ndk/all",
6262
"THIRD_PARTY_NDK_DIR=$thirdPartyNdkDir",
6363
+ "V8_NUGET_DIR=$projectDir/$V8Path",
6464
"REACT_COMMON_DIR=$projectDir/../ReactCommon",
6565
"REACT_GENERATED_SRC_DIR=$buildDir/generated/source",
6666
"REACT_SRC_DIR=$projectDir/src/main/java/com/facebook/react",
67-
@@ -329,6 +351,7 @@
67+
@@ -384,6 +406,7 @@
6868
commandLine(getNdkBuildFullPath(),
6969
"NDK_APPLICATION_MK=$projectDir/src/main/jni/Application.mk",
7070
"THIRD_PARTY_NDK_DIR=$thirdPartyNdkDir",
7171
+ "V8_NUGET_DIR=$projectDir/$V8Path",
7272
"REACT_COMMON_DIR=$projectDir/../ReactCommon",
7373
"-C", file("src/main/jni/react/jni").absolutePath,
7474
"clean")
75-
@@ -341,10 +364,16 @@
75+
@@ -395,10 +418,16 @@
7676

7777
def packageReactNdkLibs = tasks.register("packageReactNdkLibs", Copy) {
7878
dependsOn(buildReactNdkLib)

‎android-patches/patches/Build/ReactAndroid/gradle.properties

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
--- "E:\\github\\rnm-63-fresh\\ReactAndroid\\gradle.properties" 2020-10-27 20:26:16.652167500 -0700
2-
+++ "E:\\github\\rnm-63\\ReactAndroid\\gradle.properties" 2020-10-13 21:23:43.852166500 -0700
3-
@@ -17,7 +17,7 @@
4-
OKHTTP_VERSION=3.12.12
5-
SO_LOADER_VERSION=0.9.0
1+
--- ./ReactAndroid/gradle.properties 2022-01-11 17:41:28.000000000 -0800
2+
+++ /var/folders/vs/8_b205053dddbcv7btj0w0v80000gn/T/update-1h8V3n/merge/Build/ReactAndroid/gradle.properties 2022-01-12 15:04:31.000000000 -0800
3+
@@ -15,7 +15,7 @@
4+
OKHTTP_VERSION=4.9.1
5+
SO_LOADER_VERSION=0.10.1
66

77
-BOOST_VERSION=1_63_0
88
+BOOST_VERSION=1_68_0
99
DOUBLE_CONVERSION_VERSION=1.1.6
10-
FOLLY_VERSION=2020.01.13.00
11-
GLOG_VERSION=0.3.5
10+
FOLLY_VERSION=2021.06.28.00
11+
FMT_VERSION=6.2.1

‎android-patches/patches/Build/ReactAndroid/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- "E:\\github\\rnm-63-fresh\\ReactAndroid\\packages.config" 1969-12-31 16:00:00.000000000 -0800
2-
+++ "E:\\github\\rnm-63\\ReactAndroid\\packages.config" 2020-10-13 21:24:33.373490200 -0700
1+
--- /dev/null 2022-01-12 17:14:59.000000000 -0800
2+
+++ /var/folders/vs/8_b205053dddbcv7btj0w0v80000gn/T/update-1h8V3n/merge/Build/ReactAndroid/packages.config 2022-01-12 15:04:31.000000000 -0800
33
@@ -0,0 +1,5 @@
44
+<?xml version="1.0" encoding="utf-8"?>
55
+<packages>

‎android-patches/patches/Build/ReactAndroid/release.gradle

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎android-patches/patches/Build/ReactAndroid/src/main/jni/third-party/boost/Android.mk

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
--- "E:\\github\\rnm-63-fresh\\ReactAndroid\\src\\main\\jni\\third-party\\boost\\Android.mk" 2020-10-27 20:26:17.038172200 -0700
2-
+++ "E:\\github\\rnm-63\\ReactAndroid\\src\\main\\jni\\third-party\\boost\\Android.mk" 2020-10-13 21:52:15.163202200 -0700
3-
@@ -1,8 +1,8 @@
4-
LOCAL_PATH:= $(call my-dir)
5-
include $(CLEAR_VARS)
1+
--- ./ReactAndroid/src/main/jni/third-party/boost/Android.mk 2022-01-11 17:41:29.000000000 -0800
2+
+++ /var/folders/vs/8_b205053dddbcv7btj0w0v80000gn/T/update-1h8V3n/merge/Build/ReactAndroid/src/main/jni/third-party/boost/Android.mk 2022-01-12 15:51:16.000000000 -0800
3+
@@ -6,8 +6,8 @@
4+
# They are required for Folly futures to compile successfully.
5+
LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/asm/$(TARGET_ARCH)/*.S)
66

77
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/boost_1_63_0
88
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/boost_1_63_0
99
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/boost_1_68_0
1010
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/boost_1_68_0
1111

12-
LOCAL_MODULE := boost
12+
LOCAL_MODULE := boost
1313

‎android-patches/patches/Focus/Libraries/Components/View/ReactNativeViewViewConfigAndroid.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
diff --git a/Libraries/Components/View/ReactNativeViewViewConfigAndroid.js b/Libraries/Components/View/ReactNativeViewViewConfigAndroid.js
2-
index ad2542dfa..b6d868022 100644
3-
--- a/Libraries/Components/View/ReactNativeViewViewConfigAndroid.js
4-
+++ b/Libraries/Components/View/ReactNativeViewViewConfigAndroid.js
5-
@@ -19,6 +19,12 @@ const ReactNativeViewViewConfigAndroid = {
1+
--- ./Libraries/Components/View/ReactNativeViewViewConfigAndroid.js 2021-11-08 14:22:26.000000000 -0800
2+
+++ /var/folders/vs/8_b205053dddbcv7btj0w0v80000gn/T/update-1h8V3n/merge/Focus/Libraries/Components/View/ReactNativeViewViewConfigAndroid.js 2022-01-12 15:04:31.000000000 -0800
3+
@@ -19,6 +19,12 @@
64
captured: 'onSelectCapture',
75
},
86
},

‎android-patches/patches/Focus/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactClippingViewManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- "E:\\github\\rnm-63-fresh\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\views\\view\\ReactClippingViewManager.java" 2020-10-27 20:26:16.991167000 -0700
2-
+++ "E:\\github\\rnm-63\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\views\\view\\ReactClippingViewManager.java" 2020-10-13 21:41:45.084843900 -0700
1+
--- ./ReactAndroid/src/main/java/com/facebook/react/views/view/ReactClippingViewManager.java 2021-10-25 12:38:05.000000000 -0700
2+
+++ /var/folders/vs/8_b205053dddbcv7btj0w0v80000gn/T/update-1h8V3n/merge/Focus/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactClippingViewManager.java 2022-01-12 15:04:31.000000000 -0800
33
@@ -7,7 +7,10 @@
44

55
package com.facebook.react.views.view;

‎android-patches/patches/Focus/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewFocusEvent.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- "E:\\github\\rnm-63-fresh\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\views\\view\\ReactViewFocusEvent.java" 1969-12-31 16:00:00.000000000 -0800
2-
+++ "E:\\github\\rnm-63\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\views\\view\\ReactViewFocusEvent.java" 2020-10-13 21:42:27.709385000 -0700
1+
--- /dev/null 2022-01-12 17:14:59.000000000 -0800
2+
+++ /var/folders/vs/8_b205053dddbcv7btj0w0v80000gn/T/update-1h8V3n/merge/Focus/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewFocusEvent.java 2022-01-12 15:04:31.000000000 -0800
33
@@ -0,0 +1,49 @@
44
+/**
55
+ * Copyright (c) 2015-present, Facebook, Inc.

‎android-patches/patches/Focus/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
1-
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java
2-
index 851ec10c6..4fe93de49 100644
3-
--- a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java
4-
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java
5-
@@ -25,6 +25,7 @@ import com.facebook.react.uimanager.PointerEvents;
1+
--- ./ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java 2022-01-11 17:41:29.000000000 -0800
2+
+++ /var/folders/vs/8_b205053dddbcv7btj0w0v80000gn/T/update-1h8V3n/merge/Focus/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java 2022-01-12 15:04:31.000000000 -0800
3+
@@ -25,6 +25,7 @@
64
import com.facebook.react.uimanager.Spacing;
75
import com.facebook.react.uimanager.ThemedReactContext;
86
import com.facebook.react.uimanager.UIManagerHelper;
97
+import com.facebook.react.uimanager.UIManagerModule;
108
import com.facebook.react.uimanager.ViewProps;
119
import com.facebook.react.uimanager.annotations.ReactProp;
1210
import com.facebook.react.uimanager.annotations.ReactPropGroup;
13-
@@ -48,8 +49,13 @@ public class ReactViewManager extends ReactClippingViewManager<ReactViewGroup> {
11+
@@ -48,8 +49,13 @@
1412
Spacing.START,
1513
Spacing.END,
1614
};
@@ -26,7 +24,7 @@
2624
private static final String HOTSPOT_UPDATE_KEY = "hotspotUpdate";
2725

2826
@ReactProp(name = "accessible")
29-
@@ -120,6 +126,36 @@ public class ReactViewManager extends ReactClippingViewManager<ReactViewGroup> {
27+
@@ -120,6 +126,36 @@
3028
}
3129
}
3230

@@ -63,7 +61,7 @@
6361
@ReactProp(name = "borderStyle")
6462
public void setBorderStyle(ReactViewGroup view, @Nullable String borderStyle) {
6563
view.setBorderStyle(borderStyle);
66-
@@ -287,7 +323,7 @@ public class ReactViewManager extends ReactClippingViewManager<ReactViewGroup> {
64+
@@ -289,7 +325,7 @@
6765

6866
@Override
6967
public Map<String, Integer> getCommandsMap() {
@@ -72,7 +70,7 @@ public Map<String, Integer> getCommandsMap() {
7270
}
7371

7472
@Override
75-
@@ -303,6 +339,16 @@ public class ReactViewManager extends ReactClippingViewManager<ReactViewGroup> {
73+
@@ -305,6 +341,16 @@
7674
handleSetPressed(root, args);
7775
break;
7876
}
@@ -89,7 +87,7 @@ public Map<String, Integer> getCommandsMap() {
8987
}
9088
}
9189

92-
@@ -319,6 +365,16 @@ public class ReactViewManager extends ReactClippingViewManager<ReactViewGroup> {
90+
@@ -321,6 +367,16 @@
9391
handleSetPressed(root, args);
9492
break;
9593
}

‎android-patches/patches/ImageColor/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagersPropertyCache.java

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +0,0 @@
1-
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagersPropertyCache.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagersPropertyCache.java
2-
index 6e2a1691fd..f856e85d53 100644
3-
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagersPropertyCache.java
4-
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagersPropertyCache.java
5-
@@ -325,6 +325,21 @@ import java.util.Map;
6-
}
7-
}
8-
9-
+ private static class BoxedColorPropSetter extends PropSetter {
10-
+
11-
+ public BoxedColorPropSetter(ReactProp prop, Method setter) {
12-
+ super(prop, "mixed", setter);
13-
+ }
14-
+
15-
+ @Override
16-
+ protected @Nullable Object getValueOrDefault(Object value, Context context) {
17-
+ if (value != null) {
18-
+ return ColorPropConverter.getColor(value, context);
19-
+ }
20-
+ return null;
21-
+ }
22-
+ }
23-
+
24-
/*package*/ static Map<String, String> getNativePropsForView(
25-
Class<? extends ViewManager> viewManagerTopClass,
26-
Class<? extends ReactShadowNode> shadowNodeTopClass) {
27-
@@ -418,7 +433,7 @@ import java.util.Map;
28-
return new BoxedBooleanPropSetter(annotation, method);
29-
} else if (propTypeClass == Integer.class) {
30-
if ("Color".equals(annotation.customType())) {
31-
- return new ColorPropSetter(annotation, method);
32-
+ return new BoxedColorPropSetter(annotation, method);
33-
}
34-
return new BoxedIntPropSetter(annotation, method);
35-
} else if (propTypeClass == ReadableArray.class) {

‎android-patches/patches/MAC/ReactAndroid/src/main/java/com/facebook/react/modules/debug/DevSettingsModule.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
--- "E:\\gh\\react-native-macos2\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\modules\\debug\\DevSettingsModule.java" 2021-08-31 19:52:47.502468000 -0700
2-
+++ "E:\\gh\\react-native-macos\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\modules\\debug\\DevSettingsModule.java" 2021-10-20 19:29:11.611192200 -0700
1+
--- ./ReactAndroid/src/main/java/com/facebook/react/modules/debug/DevSettingsModule.java 2021-01-28 10:24:44.000000000 -0800
2+
+++ /var/folders/vs/8_b205053dddbcv7btj0w0v80000gn/T/update-1h8V3n/merge/MAC/ReactAndroid/src/main/java/com/facebook/react/modules/debug/DevSettingsModule.java 2022-01-12 15:04:31.000000000 -0800
33
@@ -118,4 +118,9 @@
4-
public void removeListeners(double count) {
5-
// iOS only
6-
}
4+
public void removeListeners(double count) {
5+
// iOS only
6+
}
77
+
88
+ @Override
99
+ public void setIsSecondaryClickToShowDevMenuEnabled(boolean enabled) {
1010
+ // macOS only.
1111
+ }
12-
}
12+
}

‎android-patches/patches/OfficeRNHost/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,22 @@
1-
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
2-
index 63ac2ec11..26fee8860 100644
3-
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
4-
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
5-
@@ -51,6 +51,7 @@ import com.facebook.infer.annotation.ThreadConfined;
1+
--- ./ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java 2022-01-11 17:41:29.000000000 -0800
2+
+++ /var/folders/vs/8_b205053dddbcv7btj0w0v80000gn/T/update-1h8V3n/merge/OfficeRNHost/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java 2022-01-12 15:04:31.000000000 -0800
3+
@@ -52,6 +52,7 @@
64
import com.facebook.infer.annotation.ThreadSafe;
75
import com.facebook.react.bridge.Arguments;
86
import com.facebook.react.bridge.CatalystInstance;
97
+import com.facebook.react.bridge.CatalystInstance.CatalystInstanceEventListener;
108
import com.facebook.react.bridge.CatalystInstanceImpl;
119
import com.facebook.react.bridge.JSBundleLoader;
12-
import com.facebook.react.bridge.JSIModule;
13-
@@ -173,6 +174,7 @@ public class ReactInstanceManager {
14-
private final @Nullable NativeModuleCallExceptionHandler mNativeModuleCallExceptionHandler;
10+
import com.facebook.react.bridge.JSIModulePackage;
11+
@@ -182,6 +183,7 @@
1512
private final @Nullable JSIModulePackage mJSIModulePackage;
13+
private final @Nullable ReactPackageTurboModuleManagerDelegate.Builder mTMMDelegateBuilder;
1614
private List<ViewManager> mViewManagers;
1715
+ private @Nullable CatalystInstanceEventListener mCatalystInstanceEventListener;
1816

1917
private class ReactContextInitParams {
2018
private final JavaScriptExecutorFactory mJsExecutorFactory;
21-
@@ -193,6 +195,15 @@ public class ReactInstanceManager {
19+
@@ -202,6 +204,15 @@
2220
}
2321
}
2422

@@ -34,7 +32,7 @@ private class ReactContextInitParams {
3432
/** Creates a builder that is capable of creating an instance of {@link ReactInstanceManager}. */
3533
public static ReactInstanceManagerBuilder builder() {
3634
return new ReactInstanceManagerBuilder();
37-
@@ -1245,7 +1257,8 @@ public class ReactInstanceManager {
35+
@@ -1292,7 +1303,8 @@
3836
.setJSExecutor(jsExecutor)
3937
.setRegistry(nativeModuleRegistry)
4038
.setJSBundleLoader(jsBundleLoader)

‎android-patches/patches/OfficeRNHost/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- "E:\\github\\rnm-63-fresh\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\bridge\\CatalystInstance.java" 2020-10-27 20:26:16.742190400 -0700
2-
+++ "E:\\github\\rnm-63\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\bridge\\CatalystInstance.java" 2020-10-13 21:28:17.283848100 -0700
1+
--- ./ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java 2021-11-08 14:22:26.000000000 -0800
2+
+++ /var/folders/vs/8_b205053dddbcv7btj0w0v80000gn/T/update-1h8V3n/merge/OfficeRNHost/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java 2022-01-12 15:04:31.000000000 -0800
33
@@ -131,4 +131,11 @@
44
* hasNativeModule, and getNativeModules can also return TurboModules.
55
*/

0 commit comments

Comments
 (0)