From 43d00a67416e799393745b02af3baa956591066d Mon Sep 17 00:00:00 2001 From: Anandraj Date: Tue, 27 Oct 2020 21:22:15 -0700 Subject: [PATCH 1/2] (1)Rebased relevant patches over RN63 codebase (2) Removed the dependencies on checked-in version of folly, glog & double-conversion --- .ado/android-pr.yml | 2 +- .ado/npmOfficePack.js | 2 +- .ado/publish.yml | 2 +- .ado/setup_droid_deps.bat | 11 +- .ado/setup_droid_deps.sh | 8 -- .ado/templates/apple-droid-node-patching.yml | 2 +- .../BasicBuild/ReactAndroid/build.gradle | 23 ---- .../BasicBuild/ReactAndroid/gradle.properties | 11 -- .../third-party/double-conversion/Android.mk | 11 -- .../src/main/jni/third-party/glog/Android.mk | 11 -- .../ReactAndroid/NuGet.Config | 4 +- .../ReactAndroid/ReactAndroid.nuspec | 15 +- .../patches/Build/ReactAndroid/build.gradle | 95 +++++++++++++ .../Build/ReactAndroid/gradle.properties | 11 ++ .../ReactAndroid/packages.config | 4 +- .../src/main/jni/third-party/boost/Android.mk | 4 +- .../react/modules/dialog/DialogModule.java | 130 ------------------ .../modules/dialog/PlatformAlertFragment.java | 97 ------------- .../View/ReactNativeViewViewConfigAndroid.js | 4 +- .../views/view/ReactClippingViewManager.java | 6 +- .../react/views/view/ReactViewFocusEvent.java | 4 +- .../react/views/view/ReactViewManager.java | 13 +- .../facebook/react/ReactInstanceManager.java | 12 +- .../react/bridge/CatalystInstance.java | 14 ++ .../react/bridge/CatalystInstanceImpl.java | 30 ++-- .../facebook/react/bridge/ReactBridge.java | 4 +- .../jni/react/jni/CatalystInstanceImpl.cpp | 20 ++- .../main/jni/react/jni/CatalystInstanceImpl.h | 14 +- .../ReactCommon/cxxreact/CxxModule.h | 11 ++ .../ReactCommon/cxxreact/CxxNativeModule.cpp | 10 +- .../ReactCommon/cxxreact/CxxNativeModule.h | 12 +- .../ReactCommon/cxxreact/Instance.cpp | 6 +- .../ReactCommon/cxxreact/Instance.h | 11 ++ .../ReactCommon/cxxreact/PlatformBundleInfo.h | 4 +- .../react/bridge/CatalystInstance.java | 13 -- .../ReactCommon/cxxreact/CxxModule.h | 11 -- .../ReactCommon/cxxreact/Instance.h | 11 -- .../react/views/text/ReactFontManager.java | 78 ----------- .../react/ReactInstanceManagerBuilder.java | 23 ++-- .../react/bridge/ReactMarkerConstants.java | 12 ++ .../com/facebook/react/v8executor/Android.mk | 4 +- .../com/facebook/react/v8executor/OnLoad.cpp | 4 +- .../facebook/react/v8executor/V8Executor.java | 4 +- .../react/v8executor/V8ExecutorFactory.cpp | 4 +- .../react/v8executor/V8ExecutorFactory.h | 4 +- .../react/v8executor/V8ExecutorFactory.java | 4 +- .../src/main/jni/react/jni/Android.mk | 4 +- .../src/main/jni/react/jni/JReactMarker.cpp | 7 +- .../src/main/jni/third-party/v8jsi/Android.mk | 4 +- .../ReactCommon/cxxreact/ReactMarker.h | 4 +- .../V8Integration/ReactAndroid/build.gradle | 51 ------- .../react/bridge/ReactMarkerConstants.java | 12 -- android-patches/scripts/diff.bat | 10 +- 53 files changed, 290 insertions(+), 592 deletions(-) delete mode 100644 android-patches/patches/BasicBuild/ReactAndroid/build.gradle delete mode 100644 android-patches/patches/BasicBuild/ReactAndroid/gradle.properties delete mode 100644 android-patches/patches/BasicBuild/ReactAndroid/src/main/jni/third-party/double-conversion/Android.mk delete mode 100644 android-patches/patches/BasicBuild/ReactAndroid/src/main/jni/third-party/glog/Android.mk rename android-patches/patches/{BasicBuild => Build}/ReactAndroid/NuGet.Config (59%) rename android-patches/patches/{BasicBuild => Build}/ReactAndroid/ReactAndroid.nuspec (94%) create mode 100644 android-patches/patches/Build/ReactAndroid/build.gradle create mode 100644 android-patches/patches/Build/ReactAndroid/gradle.properties rename android-patches/patches/{BasicBuild => Build}/ReactAndroid/packages.config (52%) rename android-patches/patches/{BasicBuild => Build}/ReactAndroid/src/main/jni/third-party/boost/Android.mk (52%) delete mode 100644 android-patches/patches/Dialog/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/DialogModule.java delete mode 100644 android-patches/patches/Dialog/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/PlatformAlertFragment.java rename android-patches/patches/{RNHostBase => OfficeRNHost}/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java (82%) create mode 100644 android-patches/patches/OfficeRNHost/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java rename android-patches/patches/{RNHostBase => OfficeRNHost}/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java (81%) rename android-patches/patches/{BasicBuild => OfficeRNHost}/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactBridge.java (67%) rename android-patches/patches/{RNHostBase => OfficeRNHost}/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp (83%) rename android-patches/patches/{RNHostBase => OfficeRNHost}/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h (65%) create mode 100644 android-patches/patches/OfficeRNHost/ReactCommon/cxxreact/CxxModule.h rename android-patches/patches/{RNHostBase => OfficeRNHost}/ReactCommon/cxxreact/CxxNativeModule.cpp (64%) rename android-patches/patches/{RNHostBase => OfficeRNHost}/ReactCommon/cxxreact/CxxNativeModule.h (51%) rename android-patches/patches/{RNHostBase => OfficeRNHost}/ReactCommon/cxxreact/Instance.cpp (55%) create mode 100644 android-patches/patches/OfficeRNHost/ReactCommon/cxxreact/Instance.h rename android-patches/patches/{RNHostBase => OfficeRNHost}/ReactCommon/cxxreact/PlatformBundleInfo.h (56%) delete mode 100644 android-patches/patches/RNHostBase/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java delete mode 100644 android-patches/patches/RNHostBase/ReactCommon/cxxreact/CxxModule.h delete mode 100644 android-patches/patches/RNHostBase/ReactCommon/cxxreact/Instance.h delete mode 100644 android-patches/patches/Typeface/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactFontManager.java rename android-patches/patches/{V8Integration => V8}/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java (55%) create mode 100644 android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java rename android-patches/patches/{V8Integration => V8}/ReactAndroid/src/main/java/com/facebook/react/v8executor/Android.mk (67%) rename android-patches/patches/{V8Integration => V8}/ReactAndroid/src/main/java/com/facebook/react/v8executor/OnLoad.cpp (85%) rename android-patches/patches/{V8Integration => V8}/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8Executor.java (74%) rename android-patches/patches/{V8Integration => V8}/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8ExecutorFactory.cpp (80%) rename android-patches/patches/{V8Integration => V8}/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8ExecutorFactory.h (61%) rename android-patches/patches/{V8Integration => V8}/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8ExecutorFactory.java (89%) rename android-patches/patches/{V8Integration => V8}/ReactAndroid/src/main/jni/react/jni/Android.mk (65%) rename android-patches/patches/{V8Integration => V8}/ReactAndroid/src/main/jni/react/jni/JReactMarker.cpp (63%) rename android-patches/patches/{V8Integration => V8}/ReactAndroid/src/main/jni/third-party/v8jsi/Android.mk (70%) rename android-patches/patches/{V8Integration => V8}/ReactCommon/cxxreact/ReactMarker.h (56%) delete mode 100644 android-patches/patches/V8Integration/ReactAndroid/build.gradle delete mode 100644 android-patches/patches/V8Integration/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java diff --git a/.ado/android-pr.yml b/.ado/android-pr.yml index 0422e874a5ca..9403aa957875 100644 --- a/.ado/android-pr.yml +++ b/.ado/android-pr.yml @@ -42,7 +42,7 @@ jobs: - task: CmdLine@2 displayName: gradlew installArchives inputs: - script: REACT_NATIVE_DEPENDENCIES=$(System.DefaultWorkingDirectory)/build_deps ./gradlew installArchives -Pparam="excludeLibs" + script: REACT_NATIVE_BOOST_PATH=$(System.DefaultWorkingDirectory)/build_deps ./gradlew installArchives -Pparam="excludeLibs" - template: templates\prep-android-nuget.yml diff --git a/.ado/npmOfficePack.js b/.ado/npmOfficePack.js index 999e3191247f..7f383ce3c7af 100644 --- a/.ado/npmOfficePack.js +++ b/.ado/npmOfficePack.js @@ -27,7 +27,7 @@ function doPublish(fakeMode) { const onlyTagSource = !!branchVersionSuffix; if (!onlyTagSource) { // -------- Generating Android Artifacts with JavaDoc - const depsEnvPrefix = "REACT_NATIVE_DEPENDENCIES=" + path.join(process.env.BUILD_SOURCESDIRECTORY, "build_deps"); + const depsEnvPrefix = "REACT_NATIVE_BOOST_PATH=" + path.join(process.env.BUILD_SOURCESDIRECTORY, "build_deps"); const gradleCommand = path.join(process.env.BUILD_SOURCESDIRECTORY, "gradlew") + " installArchives"; exec( depsEnvPrefix + " " + gradleCommand ); diff --git a/.ado/publish.yml b/.ado/publish.yml index 792d3638c352..a7aa543c28e1 100644 --- a/.ado/publish.yml +++ b/.ado/publish.yml @@ -140,7 +140,7 @@ jobs: - task: CmdLine@2 displayName: gradlew installArchives inputs: - script: REACT_NATIVE_DEPENDENCIES=$(System.DefaultWorkingDirectory)/build_deps ./gradlew installArchives -Pparam="excludeLibs" + script: REACT_NATIVE_BOOST_PATH=$(System.DefaultWorkingDirectory)/build_deps ./gradlew installArchives -Pparam="excludeLibs" - template: templates\prep-android-nuget.yml diff --git a/.ado/setup_droid_deps.bat b/.ado/setup_droid_deps.bat index 81ceea082cf0..f5e0acd79a53 100644 --- a/.ado/setup_droid_deps.bat +++ b/.ado/setup_droid_deps.bat @@ -11,13 +11,8 @@ IF EXIST %BUILD_DEPS_DIR% ( mkdir %BUILD_DEPS_DIR% -mkdir %BUILD_DEPS_DIR%\boost_1_63_0 -mklink /D /J %BUILD_DEPS_DIR%\boost_1_63_0\boost ReactAndroid\packages\boost.1.68.0.0\lib\native\include\boost - -mkdir %BUILD_DEPS_DIR%\double-conversion-1.1.6 -mklink /D /J %BUILD_DEPS_DIR%\double-conversion-1.1.6\src double-conversion\double-conversion -mklink /D /J %BUILD_DEPS_DIR%\folly-2018.10.22.00 Folly\ -mklink /D /J %BUILD_DEPS_DIR%\glog-0.3.5 glog +mkdir %BUILD_DEPS_DIR%\boost_1_68_0 +mklink /D /J %BUILD_DEPS_DIR%\boost_1_68_0\boost ReactAndroid\packages\boost.1.68.0.0\lib\native\include\boost REM When setting up locally, set the environement variable as follows. -REM set REACT_NATIVE_DEPENDENCIES=%CD%\%BUILD_DEPS_DIR% \ No newline at end of file +REM set REACT_NATIVE_BOOST_PATH=%CD%\%BUILD_DEPS_DIR% \ No newline at end of file diff --git a/.ado/setup_droid_deps.sh b/.ado/setup_droid_deps.sh index 0a8617f1b2aa..0b4775ccabe2 100755 --- a/.ado/setup_droid_deps.sh +++ b/.ado/setup_droid_deps.sh @@ -7,12 +7,4 @@ mkdir $BUILD_DEPS_DIR mkdir $BUILD_DEPS_DIR/boost_1_68_0 ln -s "$PWD/ReactAndroid/packages/boost.1.68.0.0/lib/native/include/boost" "$BUILD_DEPS_DIR/boost_1_68_0/boost" - -ln -s "$PWD/Folly" "$BUILD_DEPS_DIR/folly-2018.10.22.00" - -mkdir $BUILD_DEPS_DIR/double-conversion-1.1.6 -ln -s "$PWD/double-conversion/double-conversion" "$BUILD_DEPS_DIR/double-conversion-1.1.6/src" - -ln -s "$PWD/glog" "$BUILD_DEPS_DIR/glog-0.3.5" - # export REACT_NATIVE_BOOST_PATH=$BUILD_DEPS_DIR \ No newline at end of file diff --git a/.ado/templates/apple-droid-node-patching.yml b/.ado/templates/apple-droid-node-patching.yml index 7f22366817e3..5b0133799ef0 100644 --- a/.ado/templates/apple-droid-node-patching.yml +++ b/.ado/templates/apple-droid-node-patching.yml @@ -5,4 +5,4 @@ steps: - task: CmdLine@2 displayName: Apply Android specific patches for Office consumption inputs: - script: node $(System.DefaultWorkingDirectory)/android-patches/bundle/bundle.js patch $(System.DefaultWorkingDirectory) BasicBuild RNHostBase V8Integration Focus --patch-store $(System.DefaultWorkingDirectory)/android-patches/patches --log-folder $(System.DefaultWorkingDirectory)/android-patches/logs --confirm ${{ parameters.apply_office_patches }} + script: node $(System.DefaultWorkingDirectory)/android-patches/bundle/bundle.js patch $(System.DefaultWorkingDirectory) Build OfficeRNHost V8 Focus --patch-store $(System.DefaultWorkingDirectory)/android-patches/patches --log-folder $(System.DefaultWorkingDirectory)/android-patches/logs --confirm ${{ parameters.apply_office_patches }} diff --git a/android-patches/patches/BasicBuild/ReactAndroid/build.gradle b/android-patches/patches/BasicBuild/ReactAndroid/build.gradle deleted file mode 100644 index a0401d644015..000000000000 --- a/android-patches/patches/BasicBuild/ReactAndroid/build.gradle +++ /dev/null @@ -1,23 +0,0 @@ ---- "D:\\code\\work\\react-native-v0.62.2\\ReactAndroid\\build.gradle" 2020-04-29 20:21:46.256667100 -0700 -+++ "D:\\code\\work\\react-native-fb62merge\\ReactAndroid\\build.gradle" 2020-04-30 14:33:50.998735500 -0700 -@@ -333,10 +333,16 @@ - - def packageReactNdkLibs = tasks.register("packageReactNdkLibs", Copy) { - dependsOn(buildReactNdkLib) -- from("$buildDir/react-ndk/all") -- into("$buildDir/react-ndk/exported") -- exclude("**/libjsc.so") -- exclude("**/libhermes.so") -+ from "$buildDir/react-ndk/all" -+ from("$thirdPartyNdkDir/jsc/jni") -+ into "$buildDir/react-ndk/exported" -+ -+ if(project.hasProperty('param') ? project.property('param').equals("excludeLibs") : false) { -+ exclude '**/*.so' -+ } else { -+ exclude '**/libjsc.so' -+ exclude("**/libhermes.so") -+ } - } - - def packageReactNdkLibsForBuck = tasks.register("packageReactNdkLibsForBuck", Copy) { diff --git a/android-patches/patches/BasicBuild/ReactAndroid/gradle.properties b/android-patches/patches/BasicBuild/ReactAndroid/gradle.properties deleted file mode 100644 index 5cca0314c5c3..000000000000 --- a/android-patches/patches/BasicBuild/ReactAndroid/gradle.properties +++ /dev/null @@ -1,11 +0,0 @@ ---- /home/mganandraj/code/rn-macos-fb62merge-fresh/ReactAndroid/gradle.properties 2020-08-17 18:05:31.634674776 -0700 -+++ /home/mganandraj/code/rn-macos-fb62merge/ReactAndroid/gradle.properties 2020-08-17 14:11:18.335499592 -0700 -@@ -17,7 +17,7 @@ - OKHTTP_VERSION=3.12.1 - SO_LOADER_VERSION=0.8.0 - --BOOST_VERSION=1_63_0 -+BOOST_VERSION=1_68_0 - DOUBLE_CONVERSION_VERSION=1.1.6 - FOLLY_VERSION=2018.10.22.00 - GLOG_VERSION=0.3.5 diff --git a/android-patches/patches/BasicBuild/ReactAndroid/src/main/jni/third-party/double-conversion/Android.mk b/android-patches/patches/BasicBuild/ReactAndroid/src/main/jni/third-party/double-conversion/Android.mk deleted file mode 100644 index 8fe31325b2cf..000000000000 --- a/android-patches/patches/BasicBuild/ReactAndroid/src/main/jni/third-party/double-conversion/Android.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- "E:\\github\\react-native-v62.2\\ReactAndroid\\src\\main\\jni\\third-party\\double-conversion\\Android.mk" 2020-05-20 22:59:33.022816200 -0700 -+++ "E:\\github\\msrn-62\\ReactAndroid\\src\\main\\jni\\third-party\\double-conversion\\Android.mk" 2020-05-20 22:07:00.020951300 -0700 -@@ -16,7 +16,7 @@ - - LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) - --CXX11_FLAGS := -Wno-unused-variable -Wno-unused-local-typedefs -+CXX11_FLAGS := -Wno-unused-variable -Wno-unused-local-typedefs -Wno-unneeded-internal-declaration - LOCAL_CFLAGS += $(CXX11_FLAGS) - - include $(BUILD_STATIC_LIBRARY) diff --git a/android-patches/patches/BasicBuild/ReactAndroid/src/main/jni/third-party/glog/Android.mk b/android-patches/patches/BasicBuild/ReactAndroid/src/main/jni/third-party/glog/Android.mk deleted file mode 100644 index 1d83bb584ba3..000000000000 --- a/android-patches/patches/BasicBuild/ReactAndroid/src/main/jni/third-party/glog/Android.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- "E:\\github\\react-native-v62.2\\ReactAndroid\\src\\main\\jni\\third-party\\glog\\Android.mk" 2020-05-20 22:59:33.023816100 -0700 -+++ "E:\\github\\msrn-62\\ReactAndroid\\src\\main\\jni\\third-party\\glog\\Android.mk" 2020-05-20 22:07:34.857339100 -0700 -@@ -16,6 +16,8 @@ - LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/exported - - LOCAL_CFLAGS += \ -+ -Wno-unused-variable \ -+ -Wno-unused-function \ - -Wwrite-strings \ - -Woverloaded-virtual \ - -Wno-sign-compare \ diff --git a/android-patches/patches/BasicBuild/ReactAndroid/NuGet.Config b/android-patches/patches/Build/ReactAndroid/NuGet.Config similarity index 59% rename from android-patches/patches/BasicBuild/ReactAndroid/NuGet.Config rename to android-patches/patches/Build/ReactAndroid/NuGet.Config index 7999f9e4ff57..0d8ca637501c 100644 --- a/android-patches/patches/BasicBuild/ReactAndroid/NuGet.Config +++ b/android-patches/patches/Build/ReactAndroid/NuGet.Config @@ -1,5 +1,5 @@ ---- "D:\\code\\work\\react-native-v0.61.5\\ReactAndroid\\NuGet.Config" 1969-12-31 16:00:00.000000000 -0800 -+++ "D:\\code\\work\\react-native-fb61merge\\ReactAndroid\\NuGet.Config" 2020-03-30 20:53:05.825371700 -0700 +--- "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 @@ -0,0 +1,13 @@ + + diff --git a/android-patches/patches/BasicBuild/ReactAndroid/ReactAndroid.nuspec b/android-patches/patches/Build/ReactAndroid/ReactAndroid.nuspec similarity index 94% rename from android-patches/patches/BasicBuild/ReactAndroid/ReactAndroid.nuspec rename to android-patches/patches/Build/ReactAndroid/ReactAndroid.nuspec index e064484813ed..b5711f1a91b8 100644 --- a/android-patches/patches/BasicBuild/ReactAndroid/ReactAndroid.nuspec +++ b/android-patches/patches/Build/ReactAndroid/ReactAndroid.nuspec @@ -1,11 +1,12 @@ ---- "E:\\github\\react-native-v62.2\\ReactAndroid\\ReactAndroid.nuspec" 1969-12-31 16:00:00.000000000 -0800 -+++ "E:\\github\\msrn-62\\ReactAndroid\\ReactAndroid.nuspec" 2020-05-20 21:13:29.624582800 -0700 -@@ -0,0 +1,140 @@ +--- "E:\\github\\rnm-63-fresh\\ReactAndroid\\ReactAndroid.nuspec" 1969-12-31 16:00:00.000000000 -0800 ++++ "E:\\github\\rnm-63\\ReactAndroid\\ReactAndroid.nuspec" 2020-10-27 20:20:54.071789900 -0700 +@@ -0,0 +1,141 @@ + + + + OfficeReact.Android + $buildNumber$ ++ 0.63 + Contains Android Implementation of React-Native + Microsoft + https://github.com/microsoft/react-native @@ -131,13 +132,13 @@ + + + -+ ++ ++ ++ ++ + + + -+ -+ -+ + + + diff --git a/android-patches/patches/Build/ReactAndroid/build.gradle b/android-patches/patches/Build/ReactAndroid/build.gradle new file mode 100644 index 000000000000..cdda10f33ca2 --- /dev/null +++ b/android-patches/patches/Build/ReactAndroid/build.gradle @@ -0,0 +1,95 @@ +--- "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 +@@ -37,6 +37,8 @@ + // and the build will use that. + def boostPath = dependenciesPath ?: System.getenv("REACT_NATIVE_BOOST_PATH") + ++def V8Path = 'packages/ReactNative.V8JSI.Android.7.0.276.32-v1' ++ + // Setup build type for NDK, supported values: {debug, release} + def nativeBuildType = System.getenv("NATIVE_BUILD_TYPE") ?: "release" + +@@ -86,11 +88,22 @@ + dest(new File(downloadsDir, "folly-${FOLLY_VERSION}.tar.gz")) + } + ++def follyReplaceContent = ''' ++ ssize_t r; ++ do { ++ r = open(name, flags, mode); ++ } while (r == -1 && errno == EINTR); ++ return r; ++''' ++ + task prepareFolly(dependsOn: dependenciesPath ? [] : [downloadFolly], type: Copy) { + from(dependenciesPath ?: tarTree(downloadFolly.dest)) + from("src/main/jni/third-party/folly/Android.mk") + include("folly-${FOLLY_VERSION}/folly/**/*", "Android.mk") + eachFile { fname -> fname.path = (fname.path - "folly-${FOLLY_VERSION}/") } ++ // Fixes problem with Folly failing to build on certain systems. See ++ // https://github.com/facebook/react-native/issues/28298 ++ filter { line -> line.replaceAll('return int\\(wrapNoInt\\(open, name, flags, mode\\)\\);', follyReplaceContent) } + includeEmptyDirs = false + into("$thirdPartyNdkDir/folly") + } +@@ -115,6 +128,14 @@ + } + } + ++task prepareV8() { ++ copy { ++ from "src/main/jni/third-party/v8jsi/" ++ include("*.mk") ++ into "$thirdPartyNdkDir/v8jsi" ++ } ++} ++ + task downloadGlog(dependsOn: createNativeDepsDirectories, type: Download) { + src("https://github.com/google/glog/archive/v${GLOG_VERSION}.tar.gz") + onlyIfNewer(true) +@@ -296,7 +317,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) + + inputs.dir("$projectDir/../ReactCommon") + inputs.dir("src/main/jni") +@@ -309,6 +330,7 @@ + "NDK_OUT=" + temporaryDir, + "NDK_LIBS_OUT=$buildDir/react-ndk/all", + "THIRD_PARTY_NDK_DIR=$buildDir/third-party-ndk", ++ "V8_NUGET_DIR=$projectDir/$V8Path", + "REACT_COMMON_DIR=$projectDir/../ReactCommon", + "REACT_SRC_DIR=$projectDir/src/main/java/com/facebook/react", + "-C", file("src/main/jni/react/jni").absolutePath, +@@ -322,6 +344,7 @@ + commandLine(getNdkBuildFullPath(), + "NDK_APPLICATION_MK=$projectDir/src/main/jni/Application.mk", + "THIRD_PARTY_NDK_DIR=$buildDir/third-party-ndk", ++ "V8_NUGET_DIR=$projectDir/$V8Path", + "REACT_COMMON_DIR=$projectDir/../ReactCommon", + "-C", file("src/main/jni/react/jni").absolutePath, + "clean") +@@ -333,10 +356,16 @@ + + def packageReactNdkLibs = tasks.register("packageReactNdkLibs", Copy) { + dependsOn(buildReactNdkLib) +- from("$buildDir/react-ndk/all") +- into("$buildDir/react-ndk/exported") +- exclude("**/libjsc.so") +- exclude("**/libhermes.so") ++ from "$buildDir/react-ndk/all" ++ from("$thirdPartyNdkDir/jsc/jni") ++ into "$buildDir/react-ndk/exported" ++ ++ if(project.hasProperty('param') ? project.property('param').equals("excludeLibs") : false) { ++ exclude '**/*.so' ++ } else { ++ exclude '**/libjsc.so' ++ exclude("**/libhermes.so") ++ } + } + + def packageReactNdkLibsForBuck = tasks.register("packageReactNdkLibsForBuck", Copy) { diff --git a/android-patches/patches/Build/ReactAndroid/gradle.properties b/android-patches/patches/Build/ReactAndroid/gradle.properties new file mode 100644 index 000000000000..e60c8afe5826 --- /dev/null +++ b/android-patches/patches/Build/ReactAndroid/gradle.properties @@ -0,0 +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.1 + SO_LOADER_VERSION=0.8.2 + +-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 diff --git a/android-patches/patches/BasicBuild/ReactAndroid/packages.config b/android-patches/patches/Build/ReactAndroid/packages.config similarity index 52% rename from android-patches/patches/BasicBuild/ReactAndroid/packages.config rename to android-patches/patches/Build/ReactAndroid/packages.config index d02486f13817..8731165cc76f 100644 --- a/android-patches/patches/BasicBuild/ReactAndroid/packages.config +++ b/android-patches/patches/Build/ReactAndroid/packages.config @@ -1,5 +1,5 @@ ---- "D:\\code\\work\\react-native-v0.61.5\\ReactAndroid\\packages.config" 1969-12-31 16:00:00.000000000 -0800 -+++ "D:\\code\\work\\react-native-fb61merge\\ReactAndroid\\packages.config" 2020-03-30 20:53:05.829342700 -0700 +--- "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 @@ -0,0 +1,5 @@ + + diff --git a/android-patches/patches/BasicBuild/ReactAndroid/src/main/jni/third-party/boost/Android.mk b/android-patches/patches/Build/ReactAndroid/src/main/jni/third-party/boost/Android.mk similarity index 52% rename from android-patches/patches/BasicBuild/ReactAndroid/src/main/jni/third-party/boost/Android.mk rename to android-patches/patches/Build/ReactAndroid/src/main/jni/third-party/boost/Android.mk index 0ecf6a0a9d6e..40e37961f9f2 100644 --- a/android-patches/patches/BasicBuild/ReactAndroid/src/main/jni/third-party/boost/Android.mk +++ b/android-patches/patches/Build/ReactAndroid/src/main/jni/third-party/boost/Android.mk @@ -1,5 +1,5 @@ ---- /home/mganandraj/code/rn-macos-fb62merge-fresh/ReactAndroid/src/main/jni/third-party/boost/Android.mk 2020-08-17 18:02:35.490031483 -0700 -+++ /home/mganandraj/code/rn-macos-fb62merge/ReactAndroid/src/main/jni/third-party/boost/Android.mk 2020-08-17 15:12:14.706279608 -0700 +--- "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) diff --git a/android-patches/patches/Dialog/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/DialogModule.java b/android-patches/patches/Dialog/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/DialogModule.java deleted file mode 100644 index b10f9394538d..000000000000 --- a/android-patches/patches/Dialog/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/DialogModule.java +++ /dev/null @@ -1,130 +0,0 @@ ---- "d:\\code\\work\\rn-62-db\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\modules\\dialog\\DialogModule.java" 2020-05-02 18:36:31.775614200 -0700 -+++ "D:\\code\\work\\rn-62-d\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\modules\\dialog\\DialogModule.java" 2020-05-02 19:27:35.938391300 -0700 -@@ -15,7 +15,6 @@ - import androidx.annotation.NonNull; - import androidx.annotation.Nullable; - import androidx.fragment.app.FragmentActivity; --import androidx.fragment.app.FragmentManager; - import com.facebook.common.logging.FLog; - import com.facebook.react.bridge.Callback; - import com.facebook.react.bridge.LifecycleEventListener; -@@ -68,12 +67,23 @@ - } - - private class FragmentManagerHelper { -- private final @NonNull FragmentManager mFragmentManager; -+ private final @NonNull androidx.fragment.app.FragmentManager mFragmentManager; -+ private final @Nullable android.app.FragmentManager mPlatformFragmentManager; - - private @Nullable Object mFragmentToShow; - -- public FragmentManagerHelper(@NonNull FragmentManager fragmentManager) { -+ private boolean isUsingPlatformFragmentManager() { -+ return mPlatformFragmentManager != null; -+ } -+ -+ public FragmentManagerHelper(android.app.FragmentManager platformFragmentManager) { -+ mFragmentManager = null; -+ mPlatformFragmentManager = platformFragmentManager; -+ } -+ -+ public FragmentManagerHelper(@NonNull androidx.fragment.app.FragmentManager fragmentManager) { - mFragmentManager = fragmentManager; -+ mPlatformFragmentManager = null; - } - - public void showPendingAlert() { -@@ -84,7 +94,12 @@ - } - - dismissExisting(); -- ((AlertFragment) mFragmentToShow).show(mFragmentManager, FRAGMENT_TAG); -+ if(isUsingPlatformFragmentManager()) { -+ ((PlatformAlertFragment) mFragmentToShow).show(mPlatformFragmentManager, FRAGMENT_TAG); -+ } else { -+ ((AlertFragment) mFragmentToShow).show(mFragmentManager, FRAGMENT_TAG); -+ } -+ - mFragmentToShow = null; - } - -@@ -92,10 +107,20 @@ - if (!mIsInForeground) { - return; - } -- AlertFragment oldFragment = (AlertFragment) mFragmentManager.findFragmentByTag(FRAGMENT_TAG); -- if (oldFragment != null && oldFragment.isResumed()) { -- oldFragment.dismiss(); -- } -+ -+ if(isUsingPlatformFragmentManager()) { -+ PlatformAlertFragment oldFragment = -+ (PlatformAlertFragment) mPlatformFragmentManager.findFragmentByTag(FRAGMENT_TAG); -+ if (oldFragment != null && oldFragment.isResumed()) { -+ oldFragment.dismiss(); -+ } -+ } else { -+ AlertFragment oldFragment = -+ (AlertFragment) mFragmentManager.findFragmentByTag(FRAGMENT_TAG); -+ if (oldFragment != null && oldFragment.isResumed()) { -+ oldFragment.dismiss(); -+ } -+ } - } - - public void showNewAlert(Bundle arguments, Callback actionCallback) { -@@ -106,15 +131,27 @@ - AlertFragmentListener actionListener = - actionCallback != null ? new AlertFragmentListener(actionCallback) : null; - -- AlertFragment alertFragment = new AlertFragment(actionListener, arguments); -- if (mIsInForeground && !mFragmentManager.isStateSaved()) { -- if (arguments.containsKey(KEY_CANCELABLE)) { -- alertFragment.setCancelable(arguments.getBoolean(KEY_CANCELABLE)); -+ if(isUsingPlatformFragmentManager()) { -+ PlatformAlertFragment platformAlertFragment = new PlatformAlertFragment(actionListener, arguments); -+ if (mIsInForeground) { // isStateSaved not available in sdk v25 and lower -+ if (arguments.containsKey(KEY_CANCELABLE)) { -+ platformAlertFragment.setCancelable(arguments.getBoolean(KEY_CANCELABLE)); -+ } -+ platformAlertFragment.show(mPlatformFragmentManager, FRAGMENT_TAG); -+ } else { -+ mFragmentToShow = platformAlertFragment; - } -- alertFragment.show(mFragmentManager, FRAGMENT_TAG); -- } else { -- mFragmentToShow = alertFragment; -- } -+ } else { -+ AlertFragment alertFragment = new AlertFragment(actionListener, arguments); -+ if (mIsInForeground && !mFragmentManager.isStateSaved()) { -+ if (arguments.containsKey(KEY_CANCELABLE)) { -+ alertFragment.setCancelable(arguments.getBoolean(KEY_CANCELABLE)); -+ } -+ alertFragment.show(mFragmentManager, FRAGMENT_TAG); -+ } else { -+ mFragmentToShow = alertFragment; -+ } -+ } - } - } - -@@ -234,9 +271,16 @@ - */ - private @Nullable FragmentManagerHelper getFragmentManagerHelper() { - Activity activity = getCurrentActivity(); -- if (activity == null || !(activity instanceof FragmentActivity)) { -+ if (activity == null) { - return null; - } -- return new FragmentManagerHelper(((FragmentActivity) activity).getSupportFragmentManager()); -+ -+ if(activity instanceof FragmentActivity) { -+ return new FragmentManagerHelper(((FragmentActivity) activity).getSupportFragmentManager()); -+ } else if(activity.getFragmentManager() != null){ -+ return new FragmentManagerHelper(activity.getFragmentManager()); -+ } else { -+ return null; -+ } - } - } diff --git a/android-patches/patches/Dialog/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/PlatformAlertFragment.java b/android-patches/patches/Dialog/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/PlatformAlertFragment.java deleted file mode 100644 index 8b5bf53e0a4d..000000000000 --- a/android-patches/patches/Dialog/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/PlatformAlertFragment.java +++ /dev/null @@ -1,97 +0,0 @@ ---- "d:\\code\\work\\rn-62-db\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\modules\\dialog\\PlatformAlertFragment.java" 1969-12-31 16:00:00.000000000 -0800 -+++ "D:\\code\\work\\rn-62-d\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\modules\\dialog\\PlatformAlertFragment.java" 2020-05-02 19:01:45.601710900 -0700 -@@ -0,0 +1,93 @@ -+/** -+ * Copyright (c) Facebook, Inc. and its affiliates. -+ * -+ * This source code is licensed under the MIT license found in the -+ * LICENSE file in the root directory of this source tree. -+ */ -+ -+package com.facebook.react.modules.dialog; -+ -+import javax.annotation.Nullable; -+ -+import android.annotation.SuppressLint; -+import android.app.AlertDialog; -+import android.app.Dialog; -+import android.app.DialogFragment; -+import android.content.DialogInterface; -+import android.content.Context; -+import android.os.Bundle; -+ -+/** -+ * A fragment used to display the dialog based on the platform DialogFragment control. Please note that the usage of this control is deprecated in API v28 in favor of the newer Jetpack/Support controls. -+ */ -+public class PlatformAlertFragment extends DialogFragment implements DialogInterface.OnClickListener { -+ /* package */ static final String ARG_TITLE = "title"; -+ /* package */ static final String ARG_MESSAGE = "message"; -+ /* package */ static final String ARG_BUTTON_POSITIVE = "button_positive"; -+ /* package */ static final String ARG_BUTTON_NEGATIVE = "button_negative"; -+ /* package */ static final String ARG_BUTTON_NEUTRAL = "button_neutral"; -+ /* package */ static final String ARG_ITEMS = "items"; -+ -+ private final @Nullable DialogModule.AlertFragmentListener mListener; -+ -+ public PlatformAlertFragment() { -+ mListener = null; -+ } -+ -+ @SuppressLint("ValidFragment") -+ public PlatformAlertFragment(@Nullable DialogModule.AlertFragmentListener listener, Bundle arguments) { -+ mListener = listener; -+ setArguments(arguments); -+ } -+ -+ -+ public static Dialog createDialog( -+ Context activityContext, Bundle arguments, DialogInterface.OnClickListener fragment) { -+ AlertDialog.Builder builder = new AlertDialog.Builder(activityContext) -+ .setTitle(arguments.getString(ARG_TITLE)); -+ -+ if (arguments.containsKey(ARG_BUTTON_POSITIVE)) { -+ builder.setPositiveButton(arguments.getString(ARG_BUTTON_POSITIVE), fragment); -+ } -+ -+ if (arguments.containsKey(ARG_BUTTON_NEGATIVE)) { -+ builder.setNegativeButton(arguments.getString(ARG_BUTTON_NEGATIVE), fragment); -+ } -+ -+ if (arguments.containsKey(ARG_BUTTON_NEUTRAL)) { -+ builder.setNeutralButton(arguments.getString(ARG_BUTTON_NEUTRAL), fragment); -+ } -+ -+ // if both message and items are set, Android will only show the message -+ // and ignore the items argument entirely -+ if (arguments.containsKey(ARG_MESSAGE)) { -+ builder.setMessage(arguments.getString(ARG_MESSAGE)); -+ } -+ -+ if (arguments.containsKey(ARG_ITEMS)) { -+ builder.setItems(arguments.getCharSequenceArray(ARG_ITEMS), fragment); -+ } -+ -+ return builder.create(); -+ } -+ -+ @Override -+ public Dialog onCreateDialog(Bundle savedInstanceState) { -+ return createDialog(getActivity(), getArguments(), this); -+ } -+ -+ @Override -+ public void onClick(DialogInterface dialog, int which) { -+ if (mListener != null) { -+ mListener.onClick(dialog, which); -+ } -+ } -+ -+ @Override -+ public void onDismiss(DialogInterface dialog) { -+ super.onDismiss(dialog); -+ if (mListener != null) { -+ mListener.onDismiss(dialog); -+ } -+ } -+} -\ No newline at end of file diff --git a/android-patches/patches/Focus/Libraries/Components/View/ReactNativeViewViewConfigAndroid.js b/android-patches/patches/Focus/Libraries/Components/View/ReactNativeViewViewConfigAndroid.js index 1761d2ddbe6e..7b29470ba68c 100644 --- a/android-patches/patches/Focus/Libraries/Components/View/ReactNativeViewViewConfigAndroid.js +++ b/android-patches/patches/Focus/Libraries/Components/View/ReactNativeViewViewConfigAndroid.js @@ -1,5 +1,5 @@ ---- /home/hermes/code/react-native-macos-fresh/Libraries/Components/View/ReactNativeViewViewConfigAndroid.js 2020-09-21 21:41:24.322788533 -0700 -+++ /home/hermes/code/react-native-macos/Libraries/Components/View/ReactNativeViewViewConfigAndroid.js 2020-09-23 12:20:05.571823280 -0700 +--- "E:\\github\\rnm-63-fresh\\Libraries\\Components\\View\\ReactNativeViewViewConfigAndroid.js" 2020-10-27 20:26:16.000189500 -0700 ++++ "E:\\github\\rnm-63\\Libraries\\Components\\View\\ReactNativeViewViewConfigAndroid.js" 2020-10-13 21:21:38.700969000 -0700 @@ -19,6 +19,12 @@ captured: 'onSelectCapture', }, diff --git a/android-patches/patches/Focus/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactClippingViewManager.java b/android-patches/patches/Focus/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactClippingViewManager.java index c6c1ffc16344..e179a2b8d22b 100644 --- a/android-patches/patches/Focus/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactClippingViewManager.java +++ b/android-patches/patches/Focus/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactClippingViewManager.java @@ -1,5 +1,5 @@ ---- /home/hermes/code/react-native-macos-fresh/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactClippingViewManager.java 2020-09-21 21:41:24.450784558 -0700 -+++ /home/hermes/code/react-native-macos/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactClippingViewManager.java 2020-09-19 11:06:41.574441701 -0700 +--- "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 @@ -7,7 +7,10 @@ package com.facebook.react.views.view; @@ -15,7 +15,7 @@ } parent.removeViewWithSubviewClippingEnabled(child); } else { -+ // Prevent focus leaks due to removal of a focused View ++ // Prevent focus leaks due to removal of a focused View + if (parent.getChildAt(index).hasFocus()) { + giveFocusToAppropriateView(parent, parent.getChildAt(index)); + } diff --git a/android-patches/patches/Focus/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewFocusEvent.java b/android-patches/patches/Focus/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewFocusEvent.java index 783105ec2125..14950e420a30 100644 --- a/android-patches/patches/Focus/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewFocusEvent.java +++ b/android-patches/patches/Focus/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewFocusEvent.java @@ -1,5 +1,5 @@ ---- /home/hermes/code/react-native-macos-fresh/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewFocusEvent.java 1969-12-31 16:00:00.000000000 -0800 -+++ /home/hermes/code/react-native-macos/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewFocusEvent.java 2020-09-19 11:06:41.574441701 -0700 +--- "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 @@ -0,0 +1,49 @@ +/** + * Copyright (c) 2015-present, Facebook, Inc. diff --git a/android-patches/patches/Focus/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java b/android-patches/patches/Focus/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java index 7eb26ba2c25e..a89d809a321d 100644 --- a/android-patches/patches/Focus/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java +++ b/android-patches/patches/Focus/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java @@ -1,5 +1,5 @@ ---- /home/hermes/code/react-native-macos-fresh/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java 2020-09-21 21:41:24.454784434 -0700 -+++ /home/hermes/code/react-native-macos/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java 2020-09-22 12:07:14.797980137 -0700 +--- "E:\\github\\rnm-63-fresh\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\views\\view\\ReactViewManager.java" 2020-10-27 20:26:16.993188900 -0700 ++++ "E:\\github\\rnm-63\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\views\\view\\ReactViewManager.java" 2020-10-13 21:46:27.236639400 -0700 @@ -48,8 +48,13 @@ Spacing.START, Spacing.END, @@ -16,7 +16,7 @@ private static final String HOTSPOT_UPDATE_KEY = "hotspotUpdate"; @ReactProp(name = "accessible") -@@ -120,6 +125,35 @@ +@@ -120,6 +125,36 @@ } } @@ -48,11 +48,12 @@ + } + ); + } ++ + @ReactProp(name = "borderStyle") public void setBorderStyle(ReactViewGroup view, @Nullable String borderStyle) { view.setBorderStyle(borderStyle); -@@ -285,7 +319,7 @@ +@@ -285,7 +320,7 @@ @Override public Map getCommandsMap() { @@ -61,7 +62,7 @@ public Map getCommandsMap() { } @Override -@@ -301,6 +335,16 @@ +@@ -301,6 +336,16 @@ handleSetPressed(root, args); break; } @@ -78,7 +79,7 @@ public Map getCommandsMap() { } } -@@ -317,6 +361,16 @@ +@@ -317,6 +362,16 @@ handleSetPressed(root, args); break; } diff --git a/android-patches/patches/RNHostBase/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/android-patches/patches/OfficeRNHost/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java similarity index 82% rename from android-patches/patches/RNHostBase/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java rename to android-patches/patches/OfficeRNHost/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java index 60f2b06e5132..7480a04b7a94 100644 --- a/android-patches/patches/RNHostBase/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java +++ b/android-patches/patches/OfficeRNHost/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java @@ -1,6 +1,6 @@ ---- "D:\\code\\work\\rn-62-db\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\ReactInstanceManager.java" 2020-04-30 21:53:45.697313300 -0700 -+++ "D:\\code\\work\\rn-62-d\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\ReactInstanceManager.java" 2020-04-30 23:18:47.718545100 -0700 -@@ -52,6 +52,7 @@ +--- "E:\\github\\rnm-63-fresh\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\ReactInstanceManager.java" 2020-10-27 20:26:16.728167300 -0700 ++++ "E:\\github\\rnm-63\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\ReactInstanceManager.java" 2020-10-13 21:26:17.779198100 -0700 +@@ -51,6 +51,7 @@ import com.facebook.infer.annotation.ThreadSafe; import com.facebook.react.bridge.Arguments; import com.facebook.react.bridge.CatalystInstance; @@ -8,7 +8,7 @@ import com.facebook.react.bridge.CatalystInstanceImpl; import com.facebook.react.bridge.JSBundleLoader; import com.facebook.react.bridge.JSIModule; -@@ -174,6 +175,7 @@ +@@ -173,6 +174,7 @@ private final @Nullable NativeModuleCallExceptionHandler mNativeModuleCallExceptionHandler; private final @Nullable JSIModulePackage mJSIModulePackage; private List mViewManagers; @@ -16,7 +16,7 @@ private class ReactContextInitParams { private final JavaScriptExecutorFactory mJsExecutorFactory; -@@ -895,6 +897,15 @@ +@@ -915,6 +917,15 @@ } } @@ -32,7 +32,7 @@ private class ReactContextInitParams { /** Add a listener to be notified of react instance events. */ public void addReactInstanceEventListener(ReactInstanceEventListener listener) { mReactInstanceEventListeners.add(listener); -@@ -1199,7 +1210,8 @@ +@@ -1230,7 +1241,8 @@ .setJSExecutor(jsExecutor) .setRegistry(nativeModuleRegistry) .setJSBundleLoader(jsBundleLoader) diff --git a/android-patches/patches/OfficeRNHost/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java b/android-patches/patches/OfficeRNHost/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java new file mode 100644 index 000000000000..823876507076 --- /dev/null +++ b/android-patches/patches/OfficeRNHost/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java @@ -0,0 +1,14 @@ +--- "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 +@@ -125,4 +125,11 @@ + * hasNativeModule, and getNativeModules can also return TurboModules. + */ + void setTurboModuleManager(JSIModule getter); ++ ++ long getPointerOfInstancePointer(); ++ ++ public interface CatalystInstanceEventListener { ++ void onModuleRegistryCreated(CatalystInstance catalystInstance); ++ } ++ + } diff --git a/android-patches/patches/RNHostBase/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java b/android-patches/patches/OfficeRNHost/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java similarity index 81% rename from android-patches/patches/RNHostBase/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java rename to android-patches/patches/OfficeRNHost/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java index 85208fb83393..c9e4938953bc 100644 --- a/android-patches/patches/RNHostBase/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java +++ b/android-patches/patches/OfficeRNHost/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java @@ -1,31 +1,31 @@ ---- "D:\\code\\work\\rn-62-db\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\bridge\\CatalystInstanceImpl.java" 2020-04-30 21:53:45.722320000 -0700 -+++ "D:\\code\\work\\rn-62-d\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\bridge\\CatalystInstanceImpl.java" 2020-04-30 23:20:49.552017200 -0700 -@@ -122,7 +122,8 @@ +--- "E:\\github\\rnm-63-fresh\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\bridge\\CatalystInstanceImpl.java" 2020-10-27 20:26:16.742190400 -0700 ++++ "E:\\github\\rnm-63\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\bridge\\CatalystInstanceImpl.java" 2020-10-13 22:13:10.906813300 -0700 +@@ -121,7 +121,8 @@ final JavaScriptExecutor jsExecutor, final NativeModuleRegistry nativeModuleRegistry, final JSBundleLoader jsBundleLoader, - NativeModuleCallExceptionHandler nativeModuleCallExceptionHandler) { + NativeModuleCallExceptionHandler nativeModuleCallExceptionHandler, + CatalystInstanceEventListener catalystInstanceEventListener) { - Log.d(ReactConstants.TAG, "Initializing React Xplat Bridge."); + FLog.d(ReactConstants.TAG, "Initializing React Xplat Bridge."); Systrace.beginSection(TRACE_TAG_REACT_JAVA_BRIDGE, "createCatalystInstanceImpl"); -@@ -140,15 +141,23 @@ +@@ -139,15 +140,23 @@ mTraceListener = new JSProfilerTraceListener(this); Systrace.endSection(TRACE_TAG_REACT_JAVA_BRIDGE); -+ Log.d(ReactConstants.TAG, "Create module registry"); ++ FLog.d(ReactConstants.TAG, "Create module registry"); + + createModuleRegistry(mNativeModulesQueueThread, + mNativeModuleRegistry.getJavaModules(this), + mNativeModuleRegistry.getCxxModules()); + + if (catalystInstanceEventListener != null) { -+ Log.d(ReactConstants.TAG, "Invoking callback onModuleRegistryCreated"); ++ FLog.d(ReactConstants.TAG, "Invoking callback onModuleRegistryCreated"); + catalystInstanceEventListener.onModuleRegistryCreated(this); + } + - Log.d(ReactConstants.TAG, "Initializing React Xplat Bridge before initializeBridge"); + FLog.d(ReactConstants.TAG, "Initializing React Xplat Bridge before initializeBridge"); Systrace.beginSection(TRACE_TAG_REACT_JAVA_BRIDGE, "initializeCxxBridge"); initializeBridge( new BridgeCallback(this), @@ -35,10 +35,10 @@ - mNativeModuleRegistry.getJavaModules(this), - mNativeModuleRegistry.getCxxModules()); + mReactQueueConfiguration.getJSQueueThread()); - Log.d(ReactConstants.TAG, "Initializing React Xplat Bridge after initializeBridge"); + FLog.d(ReactConstants.TAG, "Initializing React Xplat Bridge after initializeBridge"); Systrace.endSection(TRACE_TAG_REACT_JAVA_BRIDGE); -@@ -209,13 +218,15 @@ +@@ -208,13 +217,15 @@ private native void jniExtendNativeModules( Collection javaModules, Collection cxxModules); @@ -58,17 +58,17 @@ private native void initializeBridge( @Override public void setSourceURLs(String deviceURL, String remoteURL) { -@@ -404,7 +415,8 @@ +@@ -403,7 +414,8 @@ mJavaScriptContextHolder.clear(); mHybridData.resetNative(); - getReactQueueConfiguration().destroy(); + // TODO :: Office patch :: Not sure why is this needed ? + // getReactQueueConfiguration().destroy(); - Log.d( + FLog.d( ReactConstants.TAG, "CatalystInstanceImpl.destroy() end"); -@@ -664,6 +676,8 @@ +@@ -670,6 +682,8 @@ private native long getJavaScriptContext(); @@ -77,7 +77,7 @@ public void setSourceURLs(String deviceURL, String remoteURL) { private void incrementPendingJSCalls() { int oldPendingCalls = mPendingJSCalls.getAndIncrement(); boolean wasIdle = oldPendingCalls == 0; -@@ -766,6 +780,7 @@ +@@ -775,6 +789,7 @@ private @Nullable NativeModuleRegistry mRegistry; private @Nullable JavaScriptExecutor mJSExecutor; private @Nullable NativeModuleCallExceptionHandler mNativeModuleCallExceptionHandler; @@ -85,7 +85,7 @@ private void incrementPendingJSCalls() { public Builder setReactQueueConfigurationSpec( ReactQueueConfigurationSpec ReactQueueConfigurationSpec) { -@@ -793,13 +808,20 @@ +@@ -802,13 +817,20 @@ return this; } diff --git a/android-patches/patches/BasicBuild/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactBridge.java b/android-patches/patches/OfficeRNHost/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactBridge.java similarity index 67% rename from android-patches/patches/BasicBuild/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactBridge.java rename to android-patches/patches/OfficeRNHost/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactBridge.java index 041d0e761060..6e760b741d1f 100644 --- a/android-patches/patches/BasicBuild/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactBridge.java +++ b/android-patches/patches/OfficeRNHost/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactBridge.java @@ -1,5 +1,5 @@ ---- /home/mganandraj/code/react-native-0.62.2/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactBridge.java 2020-06-15 22:45:58.585487954 -0700 -+++ /home/mganandraj/code/react-native-macos/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactBridge.java 2020-06-15 23:32:29.375721209 -0700 +--- "E:\\github\\rnm-63-fresh\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\bridge\\ReactBridge.java" 2020-10-27 20:26:16.762190600 -0700 ++++ "E:\\github\\rnm-63\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\bridge\\ReactBridge.java" 2020-10-13 21:38:04.995797000 -0700 @@ -31,6 +31,14 @@ Systrace.beginSection( TRACE_TAG_REACT_JAVA_BRIDGE, "ReactBridge.staticInit::load:reactnativejni"); diff --git a/android-patches/patches/RNHostBase/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp b/android-patches/patches/OfficeRNHost/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp similarity index 83% rename from android-patches/patches/RNHostBase/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp rename to android-patches/patches/OfficeRNHost/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp index ef51c9714421..6f6934fdee07 100644 --- a/android-patches/patches/RNHostBase/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp +++ b/android-patches/patches/OfficeRNHost/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp @@ -1,6 +1,6 @@ ---- "D:\\code\\work\\rn-62-db\\ReactAndroid\\src\\main\\jni\\react\\jni\\CatalystInstanceImpl.cpp" 2020-04-30 21:53:47.017751900 -0700 -+++ "D:\\code\\work\\rn-62-d\\ReactAndroid\\src\\main\\jni\\react\\jni\\CatalystInstanceImpl.cpp" 2020-04-30 23:12:59.608149700 -0700 -@@ -102,6 +102,7 @@ +--- "E:\\github\\rnm-63-fresh\\ReactAndroid\\src\\main\\jni\\react\\jni\\CatalystInstanceImpl.cpp" 2020-10-27 20:26:17.024172000 -0700 ++++ "E:\\github\\rnm-63\\ReactAndroid\\src\\main\\jni\\react\\jni\\CatalystInstanceImpl.cpp" 2020-10-13 21:50:14.117742800 -0700 +@@ -101,6 +101,7 @@ void CatalystInstanceImpl::registerNatives() { registerHybrid({ makeNativeMethod("initHybrid", CatalystInstanceImpl::initHybrid), @@ -8,7 +8,7 @@ makeNativeMethod( "initializeBridge", CatalystInstanceImpl::initializeBridge), makeNativeMethod( -@@ -132,26 +133,39 @@ +@@ -131,26 +132,39 @@ makeNativeMethod( "jniHandleMemoryPressure", CatalystInstanceImpl::handleMemoryPressure), @@ -56,7 +56,7 @@ // This used to be: // -@@ -170,11 +184,7 @@ +@@ -169,12 +183,13 @@ // don't need jsModuleDescriptions any more, all the way up and down the // stack. @@ -65,11 +65,17 @@ - javaModules, - cxxModules, - moduleMessageQueue_)); -+ // TODO:: Office - Assert that moduleRegistry_ is created .. i.e. not null ++ // moduleRegistry_ = std::make_shared(buildNativeModuleList( ++ // std::weak_ptr(instance_), ++ // javaModules, ++ // cxxModules, ++ // moduleMessageQueue_)); ++ // TODO:: Office - Assert that moduleRegistry_ is created .. i.e. not null instance_->initializeBridge( std::make_unique(callback, moduleMessageQueue_), -@@ -285,6 +295,10 @@ + jseh->getExecutorFactory(), +@@ -284,6 +299,10 @@ instance_->handleMemoryPressure(pressureLevel); } diff --git a/android-patches/patches/RNHostBase/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h b/android-patches/patches/OfficeRNHost/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h similarity index 65% rename from android-patches/patches/RNHostBase/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h rename to android-patches/patches/OfficeRNHost/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h index 6a4e891f213c..38a88b51c9d4 100644 --- a/android-patches/patches/RNHostBase/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h +++ b/android-patches/patches/OfficeRNHost/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h @@ -1,13 +1,13 @@ ---- "D:\\code\\work\\rn-62-db\\ReactAndroid\\src\\main\\jni\\react\\jni\\CatalystInstanceImpl.h" 2020-04-30 21:53:47.018754100 -0700 -+++ "D:\\code\\work\\rn-62-d\\ReactAndroid\\src\\main\\jni\\react\\jni\\CatalystInstanceImpl.h" 2020-04-30 22:43:14.541110000 -0700 -@@ -49,17 +49,16 @@ +--- "E:\\github\\rnm-63-fresh\\ReactAndroid\\src\\main\\jni\\react\\jni\\CatalystInstanceImpl.h" 2020-10-27 20:26:17.024172000 -0700 ++++ "E:\\github\\rnm-63\\ReactAndroid\\src\\main\\jni\\react\\jni\\CatalystInstanceImpl.h" 2020-10-13 21:51:15.981376100 -0700 +@@ -48,17 +48,16 @@ CatalystInstanceImpl(); + void createModuleRegistry( -+ jni::alias_ref nativeModulesQueue, -+ jni::alias_ref::javaobject> javaModules, -+ jni::alias_ref::javaobject> cxxModules); ++ jni::alias_ref nativeModulesQueue, ++ jni::alias_ref::javaobject> javaModules, ++ jni::alias_ref::javaobject> cxxModules); + void initializeBridge( jni::alias_ref callback, @@ -24,7 +24,7 @@ void extendNativeModules( jni::alias_ref + +-using namespace std::placeholders; +- + namespace facebook { + namespace react { + diff --git a/android-patches/patches/RNHostBase/ReactCommon/cxxreact/CxxNativeModule.cpp b/android-patches/patches/OfficeRNHost/ReactCommon/cxxreact/CxxNativeModule.cpp similarity index 64% rename from android-patches/patches/RNHostBase/ReactCommon/cxxreact/CxxNativeModule.cpp rename to android-patches/patches/OfficeRNHost/ReactCommon/cxxreact/CxxNativeModule.cpp index 59a65e5ea047..09ecb9f296b2 100644 --- a/android-patches/patches/RNHostBase/ReactCommon/cxxreact/CxxNativeModule.cpp +++ b/android-patches/patches/OfficeRNHost/ReactCommon/cxxreact/CxxNativeModule.cpp @@ -1,6 +1,6 @@ ---- "D:\\code\\work\\rn-62-db\\ReactCommon\\cxxreact\\CxxNativeModule.cpp" 2020-04-30 21:53:47.083751200 -0700 -+++ "D:\\code\\work\\rn-62-d\\ReactCommon\\cxxreact\\CxxNativeModule.cpp" 2020-04-30 22:15:29.526938500 -0700 -@@ -190,5 +190,18 @@ +--- "E:\\github\\rnm-63-fresh\\ReactCommon\\cxxreact\\CxxNativeModule.cpp" 2020-10-27 20:26:17.181166900 -0700 ++++ "E:\\github\\rnm-63\\ReactCommon\\cxxreact\\CxxNativeModule.cpp" 2020-10-13 21:55:00.437153500 -0700 +@@ -209,5 +209,18 @@ } } @@ -17,5 +17,5 @@ + std::move(messageQueueThread)); +} + - } - } + } // namespace react + } // namespace facebook diff --git a/android-patches/patches/RNHostBase/ReactCommon/cxxreact/CxxNativeModule.h b/android-patches/patches/OfficeRNHost/ReactCommon/cxxreact/CxxNativeModule.h similarity index 51% rename from android-patches/patches/RNHostBase/ReactCommon/cxxreact/CxxNativeModule.h rename to android-patches/patches/OfficeRNHost/ReactCommon/cxxreact/CxxNativeModule.h index ef721751e2b9..d8866ad220dc 100644 --- a/android-patches/patches/RNHostBase/ReactCommon/cxxreact/CxxNativeModule.h +++ b/android-patches/patches/OfficeRNHost/ReactCommon/cxxreact/CxxNativeModule.h @@ -1,8 +1,8 @@ ---- "D:\\code\\work\\rn-62-db\\ReactCommon\\cxxreact\\CxxNativeModule.h" 2020-04-30 21:53:47.084750700 -0700 -+++ "D:\\code\\work\\rn-62-d\\ReactCommon\\cxxreact\\CxxNativeModule.h" 2020-04-30 22:14:14.012895400 -0700 -@@ -40,6 +40,12 @@ - void invoke(unsigned int reactMethodId, folly::dynamic&& params, int callId) override; - MethodCallResult callSerializableNativeHook(unsigned int hookId, folly::dynamic&& args) override; +--- "E:\\github\\rnm-63-fresh\\ReactCommon\\cxxreact\\CxxNativeModule.h" 2020-10-27 20:26:17.181166900 -0700 ++++ "E:\\github\\rnm-63\\ReactCommon\\cxxreact\\CxxNativeModule.h" 2020-10-13 21:55:26.637861300 -0700 +@@ -45,6 +45,12 @@ + unsigned int hookId, + folly::dynamic &&args) override; + // Adding this factory method so that Office Android can delay load binary reactnativejni + static std::unique_ptr Make(std::weak_ptr instance, @@ -10,6 +10,6 @@ + xplat::module::CxxModule::Provider provider, + std::shared_ptr messageQueueThread); + - private: + private: void lazyInit(); diff --git a/android-patches/patches/RNHostBase/ReactCommon/cxxreact/Instance.cpp b/android-patches/patches/OfficeRNHost/ReactCommon/cxxreact/Instance.cpp similarity index 55% rename from android-patches/patches/RNHostBase/ReactCommon/cxxreact/Instance.cpp rename to android-patches/patches/OfficeRNHost/ReactCommon/cxxreact/Instance.cpp index 2076b696deb6..4bfcdb11465b 100644 --- a/android-patches/patches/RNHostBase/ReactCommon/cxxreact/Instance.cpp +++ b/android-patches/patches/OfficeRNHost/ReactCommon/cxxreact/Instance.cpp @@ -1,6 +1,6 @@ ---- "D:\\code\\work\\rn-62-db\\ReactCommon\\cxxreact\\Instance.cpp" 2020-04-30 21:53:47.085750800 -0700 -+++ "D:\\code\\work\\rn-62-d\\ReactCommon\\cxxreact\\Instance.cpp" 2020-04-30 23:15:40.653299100 -0700 -@@ -38,6 +38,11 @@ +--- "E:\\github\\rnm-63-fresh\\ReactCommon\\cxxreact\\Instance.cpp" 2020-10-27 20:26:17.182168000 -0700 ++++ "E:\\github\\rnm-63\\ReactCommon\\cxxreact\\Instance.cpp" 2020-10-13 21:55:46.414313400 -0700 +@@ -39,6 +39,11 @@ } } diff --git a/android-patches/patches/OfficeRNHost/ReactCommon/cxxreact/Instance.h b/android-patches/patches/OfficeRNHost/ReactCommon/cxxreact/Instance.h new file mode 100644 index 000000000000..88059cd8bf79 --- /dev/null +++ b/android-patches/patches/OfficeRNHost/ReactCommon/cxxreact/Instance.h @@ -0,0 +1,11 @@ +--- "E:\\github\\rnm-63-fresh\\ReactCommon\\cxxreact\\Instance.h" 2020-10-27 20:26:17.182168000 -0700 ++++ "E:\\github\\rnm-63\\ReactCommon\\cxxreact\\Instance.h" 2020-10-13 21:56:09.532647200 -0700 +@@ -41,6 +41,8 @@ + class RN_EXPORT Instance { + public: + ~Instance(); ++ ++ void setModuleRegistry(std::shared_ptr moduleRegistry); + void initializeBridge( + std::unique_ptr callback, + std::shared_ptr jsef, diff --git a/android-patches/patches/RNHostBase/ReactCommon/cxxreact/PlatformBundleInfo.h b/android-patches/patches/OfficeRNHost/ReactCommon/cxxreact/PlatformBundleInfo.h similarity index 56% rename from android-patches/patches/RNHostBase/ReactCommon/cxxreact/PlatformBundleInfo.h rename to android-patches/patches/OfficeRNHost/ReactCommon/cxxreact/PlatformBundleInfo.h index c6ce13e9a10c..bf7661697280 100644 --- a/android-patches/patches/RNHostBase/ReactCommon/cxxreact/PlatformBundleInfo.h +++ b/android-patches/patches/OfficeRNHost/ReactCommon/cxxreact/PlatformBundleInfo.h @@ -1,5 +1,5 @@ ---- "e:\\github\\fb-react-native-forpatch-base\\ReactCommon\\cxxreact\\PlatformBundleInfo.h" 1969-12-31 16:00:00.000000000 -0800 -+++ "e:\\github\\ms-react-native-forpatch\\ReactCommon\\cxxreact\\PlatformBundleInfo.h" 2020-01-29 14:10:09.752895100 -0800 +--- "E:\\github\\rnm-63-fresh\\ReactCommon\\cxxreact\\PlatformBundleInfo.h" 1969-12-31 16:00:00.000000000 -0800 ++++ "E:\\github\\rnm-63\\ReactCommon\\cxxreact\\PlatformBundleInfo.h" 2020-10-13 21:56:36.835848700 -0700 @@ -0,0 +1,15 @@ +#pragma once + diff --git a/android-patches/patches/RNHostBase/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java b/android-patches/patches/RNHostBase/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java deleted file mode 100644 index f000d1ebeaba..000000000000 --- a/android-patches/patches/RNHostBase/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java +++ /dev/null @@ -1,13 +0,0 @@ ---- "D:\\code\\work\\rn-62-db\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\bridge\\CatalystInstance.java" 2020-04-30 21:53:45.721316700 -0700 -+++ "D:\\code\\work\\rn-62-d\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\bridge\\CatalystInstance.java" 2020-04-30 22:53:26.318938900 -0700 -@@ -125,4 +125,10 @@ - * hasNativeModule, and getNativeModules can also return TurboModules. - */ - void setTurboModuleManager(JSIModule getter); -+ -+ long getPointerOfInstancePointer(); -+ -+ public interface CatalystInstanceEventListener { -+ void onModuleRegistryCreated(CatalystInstance catalystInstance); -+ } - } diff --git a/android-patches/patches/RNHostBase/ReactCommon/cxxreact/CxxModule.h b/android-patches/patches/RNHostBase/ReactCommon/cxxreact/CxxModule.h deleted file mode 100644 index 6857837c9c74..000000000000 --- a/android-patches/patches/RNHostBase/ReactCommon/cxxreact/CxxModule.h +++ /dev/null @@ -1,11 +0,0 @@ ---- "D:\\code\\work\\react-native-v0.62.2\\ReactCommon\\cxxreact\\CxxModule.h" 2020-04-29 20:21:46.414680200 -0700 -+++ "D:\\code\\work\\react-native-fb62merge\\ReactCommon\\cxxreact\\CxxModule.h" 2020-05-18 21:03:35.130510900 -0700 -@@ -14,8 +14,6 @@ - - #include - --using namespace std::placeholders; -- - namespace facebook { - namespace react { - diff --git a/android-patches/patches/RNHostBase/ReactCommon/cxxreact/Instance.h b/android-patches/patches/RNHostBase/ReactCommon/cxxreact/Instance.h deleted file mode 100644 index 6ddcd9f5e0f5..000000000000 --- a/android-patches/patches/RNHostBase/ReactCommon/cxxreact/Instance.h +++ /dev/null @@ -1,11 +0,0 @@ ---- "D:\\code\\work\\rn-62-db\\ReactCommon\\cxxreact\\Instance.h" 2020-04-30 21:53:47.085750800 -0700 -+++ "D:\\code\\work\\rn-62-d\\ReactCommon\\cxxreact\\Instance.h" 2020-04-30 23:14:27.446293700 -0700 -@@ -39,6 +39,8 @@ - class RN_EXPORT Instance { - public: - ~Instance(); -+ -+ void setModuleRegistry(std::shared_ptr moduleRegistry); - void initializeBridge(std::unique_ptr callback, - std::shared_ptr jsef, - std::shared_ptr jsQueue, diff --git a/android-patches/patches/Typeface/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactFontManager.java b/android-patches/patches/Typeface/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactFontManager.java deleted file mode 100644 index ffb1cc95abe9..000000000000 --- a/android-patches/patches/Typeface/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactFontManager.java +++ /dev/null @@ -1,78 +0,0 @@ ---- "d:\\code\\work\\rn-62-db\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\views\\text\\ReactFontManager.java" 2020-05-02 18:36:31.994612900 -0700 -+++ "D:\\code\\work\\rn-62-d\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\views\\text\\ReactFontManager.java" 2020-05-02 19:52:26.730230700 -0700 -@@ -11,6 +11,7 @@ - import android.content.res.AssetManager; - import android.graphics.Typeface; - import android.os.Build; -+import android.util.Pair; - import android.util.SparseArray; - import androidx.annotation.NonNull; - import androidx.annotation.Nullable; -@@ -35,7 +36,7 @@ - private static ReactFontManager sReactFontManagerInstance; - - private final Map mFontCache; -- private final Map mCustomTypefaceCache; -+ final private Map, Typeface> mCustomTypefaceCache; - - private ReactFontManager() { - mFontCache = new HashMap<>(); -@@ -56,12 +57,18 @@ - - public @Nullable Typeface getTypeface( - String fontFamilyName, int style, int weight, AssetManager assetManager) { -- if (mCustomTypefaceCache.containsKey(fontFamilyName)) { -- Typeface typeface = mCustomTypefaceCache.get(fontFamilyName); -- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && weight >= 100 && weight <= 1000) { -- return Typeface.create(typeface, weight, (style & Typeface.ITALIC) != 0); -- } -- return Typeface.create(typeface, style); -+ Pair key = Pair.create(fontFamilyName, weight); -+ if (mCustomTypefaceCache.containsKey(key)) { -+ return Typeface.create(mCustomTypefaceCache.get(key), style); -+ } else { -+ key = Pair.create(fontFamilyName, null); -+ if(mCustomTypefaceCache.containsKey(key)) { -+ Typeface typeface = mCustomTypefaceCache.get(fontFamilyName); -+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && weight >= 100 && weight <= 1000) { -+ return Typeface.create(typeface, weight, (style & Typeface.ITALIC) != 0); -+ } -+ return Typeface.create(typeface, style); -+ } - } - - FontFamily fontFamily = mFontCache.get(fontFamilyName); -@@ -91,8 +98,32 @@ - public void addCustomFont(@NonNull Context context, @NonNull String fontFamily, int fontId) { - Typeface font = ResourcesCompat.getFont(context, fontId); - if (font != null) { -- mCustomTypefaceCache.put(fontFamily, font); -+ addCustomFont(fontFamily, font); -+ } -+ } -+ -+ /* -+ * This method allows you to load custom fonts from a custom Typeface object and register it as a specific -+ * fontFamily and weight. This can be used when fonts are delivered during runtime and cannot be included in -+ * the standard app resources. Typeface's registered using a specific weight will take priority over ones -+ * registered without a specific weight. -+ * -+ * ReactFontManager.getInstance().addCustomFont("Srisakdi", 600, typeface); -+ */ -+ public void addCustomFont(@NonNull String fontFamily, int weight, @NonNull Typeface typeface) { -+ mCustomTypefaceCache.put(Pair.create(fontFamily, weight), typeface); - } -+ -+ /* -+ * This method allows you to load custom fonts from a custom Typeface object and register it as a specific -+ * fontFamily. This can be used when fonts are delivered during runtime and cannot be included in -+ * the standard app resources. Typeface's registered using a specific weight will take priority over ones -+ * registered without a specific weight. -+ * -+ * ReactFontManager.getInstance().addCustomFont("Srisakdi", typeface); -+ */ -+ public void addCustomFont(@NonNull String fontFamily, @NonNull Typeface typeface) { -+ mCustomTypefaceCache.put(Pair.create(fontFamily, null), typeface); - } - - /** diff --git a/android-patches/patches/V8Integration/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java b/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java similarity index 55% rename from android-patches/patches/V8Integration/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java rename to android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java index 087c7e4f2e64..8b8f4bfb7a43 100644 --- a/android-patches/patches/V8Integration/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java +++ b/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java @@ -1,6 +1,6 @@ ---- "D:\\code\\work\\rn-62-db\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\ReactInstanceManagerBuilder.java" 2020-04-30 15:18:41.711691800 -0700 -+++ "D:\\code\\work\\rn-62-d\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\ReactInstanceManagerBuilder.java" 2020-04-30 15:32:28.930329800 -0700 -@@ -27,6 +27,7 @@ +--- "E:\\github\\rnm-63-fresh\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\ReactInstanceManagerBuilder.java" 2020-10-27 20:26:16.728167300 -0700 ++++ "E:\\github\\rnm-63\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\ReactInstanceManagerBuilder.java" 2020-10-13 21:27:45.535631600 -0700 +@@ -26,6 +26,7 @@ import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener; import com.facebook.react.devsupport.interfaces.DevSupportManager; import com.facebook.react.jscexecutor.JSCExecutorFactory; @@ -8,20 +8,21 @@ import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler; import com.facebook.react.packagerconnection.RequestHandler; import com.facebook.react.uimanager.UIImplementationProvider; -@@ -291,6 +292,8 @@ - } +@@ -291,7 +292,8 @@ - private JavaScriptExecutorFactory getDefaultJSExecutorFactory(String appName, String deviceName, Context applicationContext) { -+ return new V8ExecutorFactory(appName, deviceName); -+ /* - try { + private JavaScriptExecutorFactory getDefaultJSExecutorFactory( + String appName, String deviceName, Context applicationContext) { +- try { ++ return new V8ExecutorFactory(appName, deviceName); ++/* try { // If JSC is included, use it as normal initializeSoLoaderIfNecessary(applicationContext); -@@ -325,6 +328,6 @@ + SoLoader.loadLibrary("jscexecutor"); +@@ -325,6 +327,6 @@ hermesE.printStackTrace(); throw jscE; } - } -+ }*/ ++ } */ } } diff --git a/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java b/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java new file mode 100644 index 000000000000..37ef5ce3ecb2 --- /dev/null +++ b/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java @@ -0,0 +1,12 @@ +--- "E:\\github\\rnm-63-fresh\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\bridge\\ReactMarkerConstants.java" 2020-10-27 20:26:16.764168100 -0700 ++++ "E:\\github\\rnm-63\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\bridge\\ReactMarkerConstants.java" 2020-10-13 21:38:34.972566300 -0700 +@@ -108,5 +108,8 @@ + FABRIC_BATCH_EXECUTION_START, + FABRIC_BATCH_EXECUTION_END, + FABRIC_UPDATE_UI_MAIN_THREAD_START, +- FABRIC_UPDATE_UI_MAIN_THREAD_END ++ FABRIC_UPDATE_UI_MAIN_THREAD_END, ++ BYTECODE_CREATION_FAILED, ++ BYTECODE_READ_FAILED, ++ BYTECODE_WRITE_FAILED, + } diff --git a/android-patches/patches/V8Integration/ReactAndroid/src/main/java/com/facebook/react/v8executor/Android.mk b/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/v8executor/Android.mk similarity index 67% rename from android-patches/patches/V8Integration/ReactAndroid/src/main/java/com/facebook/react/v8executor/Android.mk rename to android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/v8executor/Android.mk index d976fc056aa5..894461dc50c2 100644 --- a/android-patches/patches/V8Integration/ReactAndroid/src/main/java/com/facebook/react/v8executor/Android.mk +++ b/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/v8executor/Android.mk @@ -1,5 +1,5 @@ ---- /home/mganandraj/code/react-native-0.62.2/ReactAndroid/src/main/java/com/facebook/react/v8executor/Android.mk 1969-12-31 16:00:00.000000000 -0800 -+++ /home/mganandraj/code/react-native-macos/ReactAndroid/src/main/java/com/facebook/react/v8executor/Android.mk 2020-06-15 23:10:08.993805851 -0700 +--- "E:\\github\\rnm-63-fresh\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\v8executor\\Android.mk" 1969-12-31 16:00:00.000000000 -0800 ++++ "E:\\github\\rnm-63\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\v8executor\\Android.mk" 2020-10-13 21:39:46.668978500 -0700 @@ -0,0 +1,21 @@ +# Copyright (c) Facebook, Inc. and its affiliates. +# diff --git a/android-patches/patches/V8Integration/ReactAndroid/src/main/java/com/facebook/react/v8executor/OnLoad.cpp b/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/v8executor/OnLoad.cpp similarity index 85% rename from android-patches/patches/V8Integration/ReactAndroid/src/main/java/com/facebook/react/v8executor/OnLoad.cpp rename to android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/v8executor/OnLoad.cpp index 5f8d0b49b43c..a14248f351fd 100644 --- a/android-patches/patches/V8Integration/ReactAndroid/src/main/java/com/facebook/react/v8executor/OnLoad.cpp +++ b/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/v8executor/OnLoad.cpp @@ -1,5 +1,5 @@ ---- /home/mganandraj/code/react-native-0.62.2/ReactAndroid/src/main/java/com/facebook/react/v8executor/OnLoad.cpp 1969-12-31 16:00:00.000000000 -0800 -+++ /home/mganandraj/code/react-native-macos/ReactAndroid/src/main/java/com/facebook/react/v8executor/OnLoad.cpp 2020-06-09 12:46:01.319769902 -0700 +--- "E:\\github\\rnm-63-fresh\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\v8executor\\OnLoad.cpp" 1969-12-31 16:00:00.000000000 -0800 ++++ "E:\\github\\rnm-63\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\v8executor\\OnLoad.cpp" 2020-10-13 21:39:46.686975700 -0700 @@ -0,0 +1,51 @@ +// Copyright (c) Facebook, Inc. and its affiliates. +// diff --git a/android-patches/patches/V8Integration/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8Executor.java b/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8Executor.java similarity index 74% rename from android-patches/patches/V8Integration/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8Executor.java rename to android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8Executor.java index e2a01591a024..7618956047d1 100644 --- a/android-patches/patches/V8Integration/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8Executor.java +++ b/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8Executor.java @@ -1,5 +1,5 @@ ---- /home/mganandraj/code/react-native-0.62.2/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8Executor.java 1969-12-31 16:00:00.000000000 -0800 -+++ /home/mganandraj/code/react-native-macos/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8Executor.java 2020-06-09 12:46:01.319769902 -0700 +--- "E:\\github\\rnm-63-fresh\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\v8executor\\V8Executor.java" 1969-12-31 16:00:00.000000000 -0800 ++++ "E:\\github\\rnm-63\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\v8executor\\V8Executor.java" 2020-10-13 21:39:46.702978300 -0700 @@ -0,0 +1,32 @@ +/** + * Copyright (c) 2015-present, Facebook, Inc. diff --git a/android-patches/patches/V8Integration/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8ExecutorFactory.cpp b/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8ExecutorFactory.cpp similarity index 80% rename from android-patches/patches/V8Integration/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8ExecutorFactory.cpp rename to android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8ExecutorFactory.cpp index f4482ad18bef..12d5346f82c6 100644 --- a/android-patches/patches/V8Integration/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8ExecutorFactory.cpp +++ b/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8ExecutorFactory.cpp @@ -1,5 +1,5 @@ ---- /home/mganandraj/code/react-native-0.62.2/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8ExecutorFactory.cpp 1969-12-31 16:00:00.000000000 -0800 -+++ /home/mganandraj/code/react-native-macos/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8ExecutorFactory.cpp 2020-06-15 23:05:18.681783438 -0700 +--- "E:\\github\\rnm-63-fresh\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\v8executor\\V8ExecutorFactory.cpp" 1969-12-31 16:00:00.000000000 -0800 ++++ "E:\\github\\rnm-63\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\v8executor\\V8ExecutorFactory.cpp" 2020-10-13 21:39:46.712977300 -0700 @@ -0,0 +1,35 @@ +#include +#include diff --git a/android-patches/patches/V8Integration/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8ExecutorFactory.h b/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8ExecutorFactory.h similarity index 61% rename from android-patches/patches/V8Integration/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8ExecutorFactory.h rename to android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8ExecutorFactory.h index a51f2c94cec6..df513f30fb0c 100644 --- a/android-patches/patches/V8Integration/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8ExecutorFactory.h +++ b/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8ExecutorFactory.h @@ -1,5 +1,5 @@ ---- /home/mganandraj/code/react-native-0.62.2/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8ExecutorFactory.h 1969-12-31 16:00:00.000000000 -0800 -+++ /home/mganandraj/code/react-native-macos/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8ExecutorFactory.h 2020-06-09 12:46:01.323769932 -0700 +--- "E:\\github\\rnm-63-fresh\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\v8executor\\V8ExecutorFactory.h" 1969-12-31 16:00:00.000000000 -0800 ++++ "E:\\github\\rnm-63\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\v8executor\\V8ExecutorFactory.h" 2020-10-13 21:39:46.729978100 -0700 @@ -0,0 +1,17 @@ +#include +#include diff --git a/android-patches/patches/V8Integration/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8ExecutorFactory.java b/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8ExecutorFactory.java similarity index 89% rename from android-patches/patches/V8Integration/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8ExecutorFactory.java rename to android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8ExecutorFactory.java index ff9be7017856..79ad39a9e6ea 100644 --- a/android-patches/patches/V8Integration/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8ExecutorFactory.java +++ b/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8ExecutorFactory.java @@ -1,5 +1,5 @@ ---- /home/mganandraj/code/react-native-0.62.2/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8ExecutorFactory.java 1969-12-31 16:00:00.000000000 -0800 -+++ /home/mganandraj/code/react-native-macos/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8ExecutorFactory.java 2020-06-09 12:46:01.323769932 -0700 +--- "E:\\github\\rnm-63-fresh\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\v8executor\\V8ExecutorFactory.java" 1969-12-31 16:00:00.000000000 -0800 ++++ "E:\\github\\rnm-63\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\v8executor\\V8ExecutorFactory.java" 2020-10-13 21:39:46.743977500 -0700 @@ -0,0 +1,93 @@ +/* + * Copyright (c) 2015-present, Facebook, Inc. diff --git a/android-patches/patches/V8Integration/ReactAndroid/src/main/jni/react/jni/Android.mk b/android-patches/patches/V8/ReactAndroid/src/main/jni/react/jni/Android.mk similarity index 65% rename from android-patches/patches/V8Integration/ReactAndroid/src/main/jni/react/jni/Android.mk rename to android-patches/patches/V8/ReactAndroid/src/main/jni/react/jni/Android.mk index 898d2751c50c..3d2d00a2ee89 100644 --- a/android-patches/patches/V8Integration/ReactAndroid/src/main/jni/react/jni/Android.mk +++ b/android-patches/patches/V8/ReactAndroid/src/main/jni/react/jni/Android.mk @@ -1,5 +1,5 @@ ---- /home/mganandraj/code/react-native-0.62.2/ReactAndroid/src/main/jni/react/jni/Android.mk 2020-06-15 22:46:29.917863761 -0700 -+++ /home/mganandraj/code/react-native-macos/ReactAndroid/src/main/jni/react/jni/Android.mk 2020-06-15 23:14:47.937510703 -0700 +--- "E:\\github\\rnm-63-fresh\\ReactAndroid\\src\\main\\jni\\react\\jni\\Android.mk" 2020-10-27 20:26:17.023172300 -0700 ++++ "E:\\github\\rnm-63\\ReactAndroid\\src\\main\\jni\\react\\jni\\Android.mk" 2020-10-13 21:47:10.404176500 -0700 @@ -70,6 +70,7 @@ $(call import-module,jsiexecutor) $(call import-module,callinvoker) diff --git a/android-patches/patches/V8Integration/ReactAndroid/src/main/jni/react/jni/JReactMarker.cpp b/android-patches/patches/V8/ReactAndroid/src/main/jni/react/jni/JReactMarker.cpp similarity index 63% rename from android-patches/patches/V8Integration/ReactAndroid/src/main/jni/react/jni/JReactMarker.cpp rename to android-patches/patches/V8/ReactAndroid/src/main/jni/react/jni/JReactMarker.cpp index 1947df7c381a..b69ba5edbd65 100644 --- a/android-patches/patches/V8Integration/ReactAndroid/src/main/jni/react/jni/JReactMarker.cpp +++ b/android-patches/patches/V8/ReactAndroid/src/main/jni/react/jni/JReactMarker.cpp @@ -1,6 +1,6 @@ ---- "D:\\code\\work\\rn-62-db\\ReactAndroid\\src\\main\\jni\\react\\jni\\JReactMarker.cpp" 2020-04-30 15:18:42.261526400 -0700 -+++ "D:\\code\\work\\rn-62-d\\ReactAndroid\\src\\main\\jni\\react\\jni\\JReactMarker.cpp" 2020-04-30 15:37:35.633614200 -0700 -@@ -70,6 +70,16 @@ +--- "E:\\github\\rnm-63-fresh\\ReactAndroid\\src\\main\\jni\\react\\jni\\JReactMarker.cpp" 2020-10-27 20:26:17.027172300 -0700 ++++ "E:\\github\\rnm-63\\ReactAndroid\\src\\main\\jni\\react\\jni\\JReactMarker.cpp" 2020-10-13 21:51:47.447172900 -0700 +@@ -75,6 +75,15 @@ case ReactMarker::NATIVE_REQUIRE_STOP: // These are not used on Android. break; @@ -13,7 +13,6 @@ + case ReactMarker::BYTECODE_WRITE_FAILED: + JReactMarker::logMarker("BYTECODE_WRITE_FAILED"); + break; -+ } } diff --git a/android-patches/patches/V8Integration/ReactAndroid/src/main/jni/third-party/v8jsi/Android.mk b/android-patches/patches/V8/ReactAndroid/src/main/jni/third-party/v8jsi/Android.mk similarity index 70% rename from android-patches/patches/V8Integration/ReactAndroid/src/main/jni/third-party/v8jsi/Android.mk rename to android-patches/patches/V8/ReactAndroid/src/main/jni/third-party/v8jsi/Android.mk index e384cd3e337b..676e0cac7ae9 100644 --- a/android-patches/patches/V8Integration/ReactAndroid/src/main/jni/third-party/v8jsi/Android.mk +++ b/android-patches/patches/V8/ReactAndroid/src/main/jni/third-party/v8jsi/Android.mk @@ -1,5 +1,5 @@ ---- /home/mganandraj/code/react-native-0.62.2/ReactAndroid/src/main/jni/third-party/v8jsi/Android.mk 1969-12-31 16:00:00.000000000 -0800 -+++ /home/mganandraj/code/react-native-macos/ReactAndroid/src/main/jni/third-party/v8jsi/Android.mk 2020-06-15 22:17:48.432725518 -0700 +--- "E:\\github\\rnm-63-fresh\\ReactAndroid\\src\\main\\jni\\third-party\\v8jsi\\Android.mk" 1969-12-31 16:00:00.000000000 -0800 ++++ "E:\\github\\rnm-63\\ReactAndroid\\src\\main\\jni\\third-party\\v8jsi\\Android.mk" 2020-10-10 23:55:24.716175200 -0700 @@ -0,0 +1,17 @@ +LOCAL_PATH:= $(call my-dir) +include $(CLEAR_VARS) diff --git a/android-patches/patches/V8Integration/ReactCommon/cxxreact/ReactMarker.h b/android-patches/patches/V8/ReactCommon/cxxreact/ReactMarker.h similarity index 56% rename from android-patches/patches/V8Integration/ReactCommon/cxxreact/ReactMarker.h rename to android-patches/patches/V8/ReactCommon/cxxreact/ReactMarker.h index a6aec667e53d..cf4603a50b75 100644 --- a/android-patches/patches/V8Integration/ReactCommon/cxxreact/ReactMarker.h +++ b/android-patches/patches/V8/ReactCommon/cxxreact/ReactMarker.h @@ -1,5 +1,5 @@ ---- "D:\\code\\work\\rn-62-db\\ReactCommon\\cxxreact\\ReactMarker.h" 2020-04-30 15:18:42.344526600 -0700 -+++ "D:\\code\\work\\rn-62-d\\ReactCommon\\cxxreact\\ReactMarker.h" 2020-04-30 15:39:14.077688800 -0700 +--- "E:\\github\\rnm-63-fresh\\ReactCommon\\cxxreact\\ReactMarker.h" 2020-10-27 20:26:17.189168300 -0700 ++++ "E:\\github\\rnm-63\\ReactCommon\\cxxreact\\ReactMarker.h" 2020-10-13 21:57:00.685554800 -0700 @@ -26,7 +26,10 @@ NATIVE_MODULE_SETUP_START, NATIVE_MODULE_SETUP_STOP, diff --git a/android-patches/patches/V8Integration/ReactAndroid/build.gradle b/android-patches/patches/V8Integration/ReactAndroid/build.gradle deleted file mode 100644 index dad322b90440..000000000000 --- a/android-patches/patches/V8Integration/ReactAndroid/build.gradle +++ /dev/null @@ -1,51 +0,0 @@ ---- /home/mganandraj/code/react-native-0.62.2/ReactAndroid/build.gradle 2020-06-15 22:46:29.897863521 -0700 -+++ /home/mganandraj/code/react-native-macos/ReactAndroid/build.gradle 2020-06-15 22:18:38.761190767 -0700 -@@ -37,6 +37,8 @@ - // and the build will use that. - def boostPath = dependenciesPath ?: System.getenv("REACT_NATIVE_BOOST_PATH") - -+def V8Path = 'packages/ReactNative.V8JSI.Android.7.0.276.32-v1' -+ - // Setup build type for NDK, supported values: {debug, release} - def nativeBuildType = System.getenv("NATIVE_BUILD_TYPE") ?: "release" - -@@ -115,6 +117,14 @@ - } - } - -+task prepareV8() { -+ copy { -+ from "src/main/jni/third-party/v8jsi/" -+ include("*.mk") -+ into "$thirdPartyNdkDir/v8jsi" -+ } -+} -+ - task downloadGlog(dependsOn: createNativeDepsDirectories, type: Download) { - src("https://github.com/google/glog/archive/v${GLOG_VERSION}.tar.gz") - onlyIfNewer(true) -@@ -296,7 +306,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) - - inputs.dir("$projectDir/../ReactCommon") - inputs.dir("src/main/jni") -@@ -309,6 +319,7 @@ - "NDK_OUT=" + temporaryDir, - "NDK_LIBS_OUT=$buildDir/react-ndk/all", - "THIRD_PARTY_NDK_DIR=$buildDir/third-party-ndk", -+ "V8_NUGET_DIR=$projectDir/$V8Path", - "REACT_COMMON_DIR=$projectDir/../ReactCommon", - "REACT_SRC_DIR=$projectDir/src/main/java/com/facebook/react", - "-C", file("src/main/jni/react/jni").absolutePath, -@@ -322,6 +333,7 @@ - commandLine(getNdkBuildFullPath(), - "NDK_APPLICATION_MK=$projectDir/src/main/jni/Application.mk", - "THIRD_PARTY_NDK_DIR=$buildDir/third-party-ndk", -+ "V8_NUGET_DIR=$projectDir/$V8Path", - "REACT_COMMON_DIR=$projectDir/../ReactCommon", - "-C", file("src/main/jni/react/jni").absolutePath, - "clean") \ No newline at end of file diff --git a/android-patches/patches/V8Integration/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java b/android-patches/patches/V8Integration/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java deleted file mode 100644 index 39fc389bff27..000000000000 --- a/android-patches/patches/V8Integration/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java +++ /dev/null @@ -1,12 +0,0 @@ ---- "D:\\code\\work\\rn-62-db\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\bridge\\ReactMarkerConstants.java" 2020-04-30 15:18:41.770692300 -0700 -+++ "D:\\code\\work\\rn-62-d\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\bridge\\ReactMarkerConstants.java" 2020-04-30 15:32:56.000435800 -0700 -@@ -108,5 +108,8 @@ - FABRIC_BATCH_EXECUTION_START, - FABRIC_BATCH_EXECUTION_END, - FABRIC_UPDATE_UI_MAIN_THREAD_START, -- FABRIC_UPDATE_UI_MAIN_THREAD_END -+ FABRIC_UPDATE_UI_MAIN_THREAD_END, -+ BYTECODE_CREATION_FAILED, -+ BYTECODE_READ_FAILED, -+ BYTECODE_WRITE_FAILED, - } diff --git a/android-patches/scripts/diff.bat b/android-patches/scripts/diff.bat index 294db100a8a7..827c7bf56155 100644 --- a/android-patches/scripts/diff.bat +++ b/android-patches/scripts/diff.bat @@ -4,4 +4,12 @@ REM node %~dp0\..\bundle\bundle.js diff %~dp0\..\.. E:\github\fb-rn-p --patch-na REM node %~dp0\..\bundle\bundle.js diff %~dp0\..\.. E:\github\ms-react-native-minus --patch-name TextInputJS --whitelist-dirs Libraries\Components\TextInput\ -node ./android-patches/bundle/bundle.js diff . ../rn-macos-fb62merge-fresh --patch-name Focus --whitelist-dirs ReactAndroid/src/main/java/com/facebook/react/views/view/ +REM node ./android-patches/bundle/bundle.js diff . ../rn-macos-fb62merge-fresh --patch-name Focus --whitelist-dirs ReactAndroid/src/main/java/com/facebook/react/views/view/ + +node ./android-patches/bundle/bundle.js diff . ../rnm-63-fresh --patch-name V8 --whitelist-dirs ReactAndroid\src\main\java\com\facebook\react\v8executor\,ReactCommon\cxxreact\ReactMarker.h,ReactAndroid\src\main\jni\third-party\v8jsi\Android.mk,ReactAndroid\src\main\java\com\facebook\react\ReactInstanceManagerBuilder.java,ReactAndroid\src\main\java\com\facebook\react\bridge\ReactMarkerConstants.java,ReactAndroid\src\main\jni\react\jni\JReactMarker.cpp + +node ./android-patches/bundle/bundle.js diff . ../rnm-63-fresh --patch-name OfficeRNHost --whitelist-dirs ReactCommon,ReactAndroid\src\main\jni\react\jni\,ReactAndroid\src\main\java\com\facebook\react\ReactInstanceManager.java,ReactAndroid\src\main\java\com\facebook\react\bridge\ + +node ./android-patches/bundle/bundle.js diff . ../rnm-63-fresh --patch-name Focus --whitelist-dirs ReactAndroid\src\main\java\com\facebook\react\views\view\,Libraries\Components\View\ReactNativeViewViewConfigAndroid.js + +node ./android-patches/bundle/bundle.js diff . ../rnm-63-fresh --patch-name Build --whitelist-dirs ReactAndroid\build.gradle,ReactAndroid\gradle.properties,ReactAndroid\NuGet.Config,ReactAndroid\packages.config,ReactAndroid\ReactAndroid.nuspec,ReactAndroid\src\main\jni\third-party\boost\Android.mk \ No newline at end of file From 19e4cb6d2945c5e84d83cbd30f3667a71700f4e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eloy=20Dur=C3=A1n?= Date: Wed, 28 Oct 2020 10:43:03 +0000 Subject: [PATCH 2/2] [ado] Re-enable Android patch testing --- .ado/templates/apple-job-javascript.yml | 4 ++++ .ado/templates/apple-job-react-native.yml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/.ado/templates/apple-job-javascript.yml b/.ado/templates/apple-job-javascript.yml index 1eb7f5b9e400..33c05d75f786 100644 --- a/.ado/templates/apple-job-javascript.yml +++ b/.ado/templates/apple-job-javascript.yml @@ -17,6 +17,10 @@ steps: - template: apple-xcode-select.yml + - template: apple-droid-node-patching.yml + parameters: + apply_office_patches: $(apply_office_patches) + - script: 'yarn install' displayName: 'yarn install' diff --git a/.ado/templates/apple-job-react-native.yml b/.ado/templates/apple-job-react-native.yml index 70bdd2440fc0..d7ff00c33ba5 100644 --- a/.ado/templates/apple-job-react-native.yml +++ b/.ado/templates/apple-job-react-native.yml @@ -31,6 +31,10 @@ steps: # Task Group: Xcode select proper version - template: apple-xcode-select.yml + - template: apple-droid-node-patching.yml + parameters: + apply_office_patches: $(apply_office_patches) + - task: CmdLine@2 displayName: yarn install inputs: