Fix Android patches in fb66merge

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

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

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

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

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

@@ -1,6 +1,6 @@
---- "E:\\github\\rnm-63-fresh\\ReactAndroid\\build.gradle"	2020-10-27 20:26:16.652167500 -0700
-+++ "E:\\github\\rnm-63\\ReactAndroid\\build.gradle"	2020-10-13 22:03:22.833541000 -0700
-@@ -43,6 +43,8 @@
+--- ./ReactAndroid/build.gradle	2022-01-11 17:41:28.000000000 -0800
++++ /var/folders/vs/8_b205053dddbcv7btj0w0v80000gn/T/update-1h8V3n/merge/Build/ReactAndroid/build.gradle	2022-01-12 15:51:37.000000000 -0800
+@@ -39,6 +39,8 @@
  // and the build will use that.
  def boostPath = dependenciesPath ?: System.getenv("REACT_NATIVE_BOOST_PATH")
 
@@ -9,7 +9,7 @@
  // Setup build type for NDK, supported values: {debug, release}
  def nativeBuildType = System.getenv("NATIVE_BUILD_TYPE") ?: "release"
 
-@@ -92,11 +94,22 @@
+@@ -89,11 +91,22 @@
      dest(new File(downloadsDir, "folly-${FOLLY_VERSION}.tar.gz"))
  }
 
@@ -32,7 +32,7 @@
      includeEmptyDirs = false
      into("$thirdPartyNdkDir/folly")
  }
-@@ -119,6 +132,14 @@
+@@ -161,6 +174,14 @@
      into "$thirdPartyNdkDir/hermes"
  }
 
@@ -47,32 +47,32 @@
  task downloadGlog(dependsOn: createNativeDepsDirectories, type: Download) {
      src("https://github.com/google/glog/archive/v${GLOG_VERSION}.tar.gz")
      onlyIfNewer(true)
-@@ -303,7 +324,7 @@
+@@ -354,7 +375,7 @@
  }
 
  def buildReactNdkLib = tasks.register("buildReactNdkLib", Exec) {
--    dependsOn(prepareJSC, prepareHermes, prepareBoost, prepareDoubleConversion, prepareFolly, prepareGlog, extractAARHeaders, extractJNIFiles)
-+    dependsOn(prepareJSC, prepareHermes, prepareV8, prepareBoost, prepareDoubleConversion, prepareFolly, prepareGlog, extractAARHeaders, extractJNIFiles)
+-    dependsOn(prepareJSC, prepareHermes, prepareBoost, prepareDoubleConversion, prepareFmt, prepareFolly, prepareGlog, prepareLibevent, extractAARHeaders, extractJNIFiles)
++    dependsOn(prepareJSC, prepareHermes, prepareV8, prepareBoost, prepareDoubleConversion, prepareFmt, prepareFolly, prepareGlog, prepareLibevent, extractAARHeaders, extractJNIFiles)
      dependsOn("generateCodegenArtifactsFromSchema");
-
+ 
      inputs.dir("$projectDir/../ReactCommon")
-@@ -314,6 +335,7 @@
+@@ -370,6 +391,7 @@
              "NDK_OUT=" + temporaryDir,
              "NDK_LIBS_OUT=$buildDir/react-ndk/all",
              "THIRD_PARTY_NDK_DIR=$thirdPartyNdkDir",
 +            "V8_NUGET_DIR=$projectDir/$V8Path",
              "REACT_COMMON_DIR=$projectDir/../ReactCommon",
              "REACT_GENERATED_SRC_DIR=$buildDir/generated/source",
              "REACT_SRC_DIR=$projectDir/src/main/java/com/facebook/react",
-@@ -329,6 +351,7 @@
+@@ -384,6 +406,7 @@
      commandLine(getNdkBuildFullPath(),
              "NDK_APPLICATION_MK=$projectDir/src/main/jni/Application.mk",
              "THIRD_PARTY_NDK_DIR=$thirdPartyNdkDir",
 +            "V8_NUGET_DIR=$projectDir/$V8Path",
              "REACT_COMMON_DIR=$projectDir/../ReactCommon",
              "-C", file("src/main/jni/react/jni").absolutePath,
              "clean")
-@@ -341,10 +364,16 @@
+@@ -395,10 +418,16 @@
 
  def packageReactNdkLibs = tasks.register("packageReactNdkLibs", Copy) {
      dependsOn(buildReactNdkLib)

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

@@ -1,11 +1,11 @@
---- "E:\\github\\rnm-63-fresh\\ReactAndroid\\gradle.properties"	2020-10-27 20:26:16.652167500 -0700
-+++ "E:\\github\\rnm-63\\ReactAndroid\\gradle.properties"	2020-10-13 21:23:43.852166500 -0700
-@@ -17,7 +17,7 @@
- OKHTTP_VERSION=3.12.12
- SO_LOADER_VERSION=0.9.0
+--- ./ReactAndroid/gradle.properties	2022-01-11 17:41:28.000000000 -0800
++++ /var/folders/vs/8_b205053dddbcv7btj0w0v80000gn/T/update-1h8V3n/merge/Build/ReactAndroid/gradle.properties	2022-01-12 15:04:31.000000000 -0800
+@@ -15,7 +15,7 @@
+ OKHTTP_VERSION=4.9.1
+ SO_LOADER_VERSION=0.10.1
 
 -BOOST_VERSION=1_63_0
 +BOOST_VERSION=1_68_0
  DOUBLE_CONVERSION_VERSION=1.1.6
- FOLLY_VERSION=2020.01.13.00
- GLOG_VERSION=0.3.5
+ FOLLY_VERSION=2021.06.28.00
+ FMT_VERSION=6.2.1

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

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

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

@@ -1,13 +1,13 @@
---- "E:\\github\\rnm-63-fresh\\ReactAndroid\\src\\main\\jni\\third-party\\boost\\Android.mk"	2020-10-27 20:26:17.038172200 -0700
-+++ "E:\\github\\rnm-63\\ReactAndroid\\src\\main\\jni\\third-party\\boost\\Android.mk"	2020-10-13 21:52:15.163202200 -0700
-@@ -1,8 +1,8 @@
- LOCAL_PATH:= $(call my-dir)
- include $(CLEAR_VARS)
+--- ./ReactAndroid/src/main/jni/third-party/boost/Android.mk	2022-01-11 17:41:29.000000000 -0800
++++ /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
+@@ -6,8 +6,8 @@
+ # They are required for Folly futures to compile successfully.
+ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/asm/$(TARGET_ARCH)/*.S)
 
 -LOCAL_C_INCLUDES := $(LOCAL_PATH)/boost_1_63_0
 -LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/boost_1_63_0
 +LOCAL_C_INCLUDES := $(LOCAL_PATH)/boost_1_68_0
 +LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/boost_1_68_0
 
- LOCAL_MODULE    := boost
+ LOCAL_MODULE := boost
 

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

@@ -1,8 +1,6 @@
-diff --git a/Libraries/Components/View/ReactNativeViewViewConfigAndroid.js b/Libraries/Components/View/ReactNativeViewViewConfigAndroid.js
-index ad2542dfa..b6d868022 100644
---- a/Libraries/Components/View/ReactNativeViewViewConfigAndroid.js
-+++ b/Libraries/Components/View/ReactNativeViewViewConfigAndroid.js
-@@ -19,6 +19,12 @@ const ReactNativeViewViewConfigAndroid = {
+--- ./Libraries/Components/View/ReactNativeViewViewConfigAndroid.js	2021-11-08 14:22:26.000000000 -0800
++++ /var/folders/vs/8_b205053dddbcv7btj0w0v80000gn/T/update-1h8V3n/merge/Focus/Libraries/Components/View/ReactNativeViewViewConfigAndroid.js	2022-01-12 15:04:31.000000000 -0800
+@@ -19,6 +19,12 @@
          captured: 'onSelectCapture',
        },
      },

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

@@ -1,5 +1,5 @@
---- "E:\\github\\rnm-63-fresh\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\views\\view\\ReactClippingViewManager.java"	2020-10-27 20:26:16.991167000 -0700
-+++ "E:\\github\\rnm-63\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\views\\view\\ReactClippingViewManager.java"	2020-10-13 21:41:45.084843900 -0700
+--- ./ReactAndroid/src/main/java/com/facebook/react/views/view/ReactClippingViewManager.java	2021-10-25 12:38:05.000000000 -0700
++++ /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
 @@ -7,7 +7,10 @@
 
  package com.facebook.react.views.view;

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

@@ -1,5 +1,5 @@
---- "E:\\github\\rnm-63-fresh\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\views\\view\\ReactViewFocusEvent.java"	1969-12-31 16:00:00.000000000 -0800
-+++ "E:\\github\\rnm-63\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\views\\view\\ReactViewFocusEvent.java"	2020-10-13 21:42:27.709385000 -0700
+--- /dev/null	2022-01-12 17:14:59.000000000 -0800
++++ /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
 @@ -0,0 +1,49 @@
 +/**
 + * Copyright (c) 2015-present, Facebook, Inc.

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

@@ -1,16 +1,14 @@
-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
-index 851ec10c6..4fe93de49 100644
---- a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java
-+++ b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java
-@@ -25,6 +25,7 @@ import com.facebook.react.uimanager.PointerEvents;
+--- ./ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java	2022-01-11 17:41:29.000000000 -0800
++++ /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
+@@ -25,6 +25,7 @@
  import com.facebook.react.uimanager.Spacing;
  import com.facebook.react.uimanager.ThemedReactContext;
  import com.facebook.react.uimanager.UIManagerHelper;
 +import com.facebook.react.uimanager.UIManagerModule;
  import com.facebook.react.uimanager.ViewProps;
  import com.facebook.react.uimanager.annotations.ReactProp;
  import com.facebook.react.uimanager.annotations.ReactPropGroup;
-@@ -48,8 +49,13 @@ public class ReactViewManager extends ReactClippingViewManager<ReactViewGroup> {
+@@ -48,8 +49,13 @@
      Spacing.START,
      Spacing.END,
    };
@@ -26,7 +24,7 @@
    private static final String HOTSPOT_UPDATE_KEY = "hotspotUpdate";
 
    @ReactProp(name = "accessible")
-@@ -120,6 +126,36 @@ public class ReactViewManager extends ReactClippingViewManager<ReactViewGroup> {
+@@ -120,6 +126,36 @@
      }
    }
 
@@ -63,7 +61,7 @@
    @ReactProp(name = "borderStyle")
    public void setBorderStyle(ReactViewGroup view, @Nullable String borderStyle) {
      view.setBorderStyle(borderStyle);
-@@ -287,7 +323,7 @@ public class ReactViewManager extends ReactClippingViewManager<ReactViewGroup> {
+@@ -289,7 +325,7 @@
 
    @Override
    public Map<String, Integer> getCommandsMap() {
@@ -72,7 +70,7 @@ public Map<String, Integer> getCommandsMap() {
    }
 
    @Override
-@@ -303,6 +339,16 @@ public class ReactViewManager extends ReactClippingViewManager<ReactViewGroup> {
+@@ -305,6 +341,16 @@
            handleSetPressed(root, args);
            break;
          }
@@ -89,7 +87,7 @@ public Map<String, Integer> getCommandsMap() {
      }
    }
 
-@@ -319,6 +365,16 @@ public class ReactViewManager extends ReactClippingViewManager<ReactViewGroup> {
+@@ -321,6 +367,16 @@
            handleSetPressed(root, args);
            break;
          }

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

@@ -1,35 +0,0 @@
-diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagersPropertyCache.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagersPropertyCache.java
-index 6e2a1691fd..f856e85d53 100644
---- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagersPropertyCache.java
-+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagersPropertyCache.java
-@@ -325,6 +325,21 @@ import java.util.Map;
-     }
-   }
-
-+  private static class BoxedColorPropSetter extends PropSetter {
-+
-+    public BoxedColorPropSetter(ReactProp prop, Method setter) {
-+      super(prop, "mixed", setter);
-+    }
-+
-+    @Override
-+    protected @Nullable Object getValueOrDefault(Object value, Context context) {
-+      if (value != null) {
-+        return ColorPropConverter.getColor(value, context);
-+      }
-+      return null;
-+    }
-+  }
-+
-   /*package*/ static Map<String, String> getNativePropsForView(
-       Class<? extends ViewManager> viewManagerTopClass,
-       Class<? extends ReactShadowNode> shadowNodeTopClass) {
-@@ -418,7 +433,7 @@ import java.util.Map;
-       return new BoxedBooleanPropSetter(annotation, method);
-     } else if (propTypeClass == Integer.class) {
-       if ("Color".equals(annotation.customType())) {
--        return new ColorPropSetter(annotation, method);
-+        return new BoxedColorPropSetter(annotation, method);
-       }
-       return new BoxedIntPropSetter(annotation, method);
-     } else if (propTypeClass == ReadableArray.class) {

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

@@ -1,12 +1,12 @@
---- "E:\\gh\\react-native-macos2\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\modules\\debug\\DevSettingsModule.java"	2021-08-31 19:52:47.502468000 -0700
-+++ "E:\\gh\\react-native-macos\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\modules\\debug\\DevSettingsModule.java"	2021-10-20 19:29:11.611192200 -0700
+--- ./ReactAndroid/src/main/java/com/facebook/react/modules/debug/DevSettingsModule.java	2021-01-28 10:24:44.000000000 -0800
++++ /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
 @@ -118,4 +118,9 @@
-   public void removeListeners(double count) {
-     // iOS only
-   }
+   public void removeListeners(double count) {
+     // iOS only
+   }
 +
 +  @Override
 +  public void setIsSecondaryClickToShowDevMenuEnabled(boolean enabled) {
 +    // macOS only.
 +  }
- }
+ }

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

@@ -1,24 +1,22 @@
-diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
-index 63ac2ec11..26fee8860 100644
---- a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
-+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
-@@ -51,6 +51,7 @@ import com.facebook.infer.annotation.ThreadConfined;
+--- ./ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java	2022-01-11 17:41:29.000000000 -0800
++++ /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
+@@ -52,6 +52,7 @@
  import com.facebook.infer.annotation.ThreadSafe;
  import com.facebook.react.bridge.Arguments;
  import com.facebook.react.bridge.CatalystInstance;
 +import com.facebook.react.bridge.CatalystInstance.CatalystInstanceEventListener;
  import com.facebook.react.bridge.CatalystInstanceImpl;
  import com.facebook.react.bridge.JSBundleLoader;
- import com.facebook.react.bridge.JSIModule;
-@@ -173,6 +174,7 @@ public class ReactInstanceManager {
-   private final @Nullable NativeModuleCallExceptionHandler mNativeModuleCallExceptionHandler;
+ import com.facebook.react.bridge.JSIModulePackage;
+@@ -182,6 +183,7 @@
    private final @Nullable JSIModulePackage mJSIModulePackage;
+   private final @Nullable ReactPackageTurboModuleManagerDelegate.Builder mTMMDelegateBuilder;
    private List<ViewManager> mViewManagers;
 +  private @Nullable CatalystInstanceEventListener mCatalystInstanceEventListener;
 
    private class ReactContextInitParams {
      private final JavaScriptExecutorFactory mJsExecutorFactory;
-@@ -193,6 +195,15 @@ public class ReactInstanceManager {
+@@ -202,6 +204,15 @@
      }
    }
 
@@ -34,7 +32,7 @@ private class ReactContextInitParams {
    /** Creates a builder that is capable of creating an instance of {@link ReactInstanceManager}. */
    public static ReactInstanceManagerBuilder builder() {
      return new ReactInstanceManagerBuilder();
-@@ -1245,7 +1257,8 @@ public class ReactInstanceManager {
+@@ -1292,7 +1303,8 @@
              .setJSExecutor(jsExecutor)
              .setRegistry(nativeModuleRegistry)
              .setJSBundleLoader(jsBundleLoader)

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

@@ -1,5 +1,5 @@
---- "E:\\github\\rnm-63-fresh\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\bridge\\CatalystInstance.java"	2020-10-27 20:26:16.742190400 -0700
-+++ "E:\\github\\rnm-63\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\bridge\\CatalystInstance.java"	2020-10-13 21:28:17.283848100 -0700
+--- ./ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java	2021-11-08 14:22:26.000000000 -0800
++++ /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
 @@ -131,4 +131,11 @@
     * hasNativeModule, and getNativeModules can also return TurboModules.
     */