diff --git a/.ado/templates/apple-droid-node-patching.yml b/.ado/templates/apple-droid-node-patching.yml index 3b56bbbb9a..7ae47174ea 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 V8Integration --patch-store $(System.DefaultWorkingDirectory)/android-patches/patches-0.61.5 --log-folder $(System.DefaultWorkingDirectory)/android-patches/logs --confirm ${{ parameters.apply_office_patches }} + script: node $(System.DefaultWorkingDirectory)/android-patches/bundle/bundle.js patch $(System.DefaultWorkingDirectory) BasicBuild --patch-store $(System.DefaultWorkingDirectory)/android-patches/patches-0.62.2 --log-folder $(System.DefaultWorkingDirectory)/android-patches/logs --confirm ${{ parameters.apply_office_patches }} diff --git a/android-patches/patches-0.62.2/BasicBuild/ReactAndroid/NuGet.Config b/android-patches/patches-0.62.2/BasicBuild/ReactAndroid/NuGet.Config new file mode 100644 index 0000000000..7999f9e4ff --- /dev/null +++ b/android-patches/patches-0.62.2/BasicBuild/ReactAndroid/NuGet.Config @@ -0,0 +1,17 @@ +--- "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 +@@ -0,0 +1,13 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file diff --git a/android-patches/patches-0.62.2/BasicBuild/ReactAndroid/ReactAndroid.nuspec b/android-patches/patches-0.62.2/BasicBuild/ReactAndroid/ReactAndroid.nuspec new file mode 100644 index 0000000000..ab9a752d53 --- /dev/null +++ b/android-patches/patches-0.62.2/BasicBuild/ReactAndroid/ReactAndroid.nuspec @@ -0,0 +1,123 @@ +--- "D:\\code\\work\\react-native-v0.61.5\\ReactAndroid\\ReactAndroid.nuspec" 1969-12-31 16:00:00.000000000 -0800 ++++ "D:\\code\\work\\react-native-fb61merge\\ReactAndroid\\ReactAndroid.nuspec" 2020-03-30 21:05:08.615724600 -0700 +@@ -0,0 +1,120 @@ ++ ++ ++ ++ OfficeReact.Android ++ 0.60.0-microsoft.63.mine ++ Contains Android Implementation of React-Native ++ Microsoft ++ https://github.com/microsoft/react-native ++ ++ false ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ diff --git a/android-patches/patches-0.62.2/BasicBuild/ReactAndroid/build.gradle b/android-patches/patches-0.62.2/BasicBuild/ReactAndroid/build.gradle new file mode 100644 index 0000000000..a0401d6440 --- /dev/null +++ b/android-patches/patches-0.62.2/BasicBuild/ReactAndroid/build.gradle @@ -0,0 +1,23 @@ +--- "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-0.62.2/BasicBuild/ReactAndroid/packages.config b/android-patches/patches-0.62.2/BasicBuild/ReactAndroid/packages.config new file mode 100644 index 0000000000..65f55dc239 --- /dev/null +++ b/android-patches/patches-0.62.2/BasicBuild/ReactAndroid/packages.config @@ -0,0 +1,8 @@ +--- "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 +@@ -0,0 +1,5 @@ ++ ++ ++ ++ ++