Fixing basic build patches
This commit is contained in:
Родитель
387f0347ed
Коммит
eec7201dd8
|
@ -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 }}
|
||||
|
|
|
@ -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 @@
|
||||
+<?xml version="1.0" encoding="utf-8"?>
|
||||
+<configuration>
|
||||
+ <config>
|
||||
+ <add key="repositoryPath" value="packages" />
|
||||
+ </config>
|
||||
+
|
||||
+ <packageSources>
|
||||
+
|
||||
+ <add key="Nuget.org" value="https://api.nuget.org/v3/index.json" />
|
||||
+
|
||||
+ </packageSources>
|
||||
+
|
||||
+</configuration>
|
||||
\ No newline at end of file
|
|
@ -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 @@
|
||||
+<?xml version="1.0" encoding="utf-8"?>
|
||||
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
|
||||
+ <metadata>
|
||||
+ <id>OfficeReact.Android</id>
|
||||
+ <version>0.60.0-microsoft.63.mine</version>
|
||||
+ <description>Contains Android Implementation of React-Native</description>
|
||||
+ <authors>Microsoft</authors>
|
||||
+ <projectUrl>https://github.com/microsoft/react-native</projectUrl>
|
||||
+ <repository type="git" url="https://github.com/microsoft/react-native.git"/>
|
||||
+ <requireLicenseAcceptance>false</requireLicenseAcceptance>
|
||||
+ </metadata>
|
||||
+
|
||||
+ <files>
|
||||
+ <!-- Stripped binaries -->
|
||||
+ <file src="build\react-ndk\all\x86_64\libfb.so" target="lib\droidx64"/>
|
||||
+ <file src="build\react-ndk\all\armeabi-v7a\libfb.so" target="lib\droidarm"/>
|
||||
+ <file src="build\react-ndk\all\x86\libfb.so" target="lib\droidx86"/>
|
||||
+ <file src="build\react-ndk\all\arm64-v8a\libfb.so" target="lib\droidarm64"/>
|
||||
+
|
||||
+ <file src="build\react-ndk\all\x86_64\libfolly_json.so" target="lib\droidx64"/>
|
||||
+ <file src="build\react-ndk\all\armeabi-v7a\libfolly_json.so" target="lib\droidarm"/>
|
||||
+ <file src="build\react-ndk\all\x86\libfolly_json.so" target="lib\droidx86"/>
|
||||
+ <file src="build\react-ndk\all\arm64-v8a\libfolly_json.so" target="lib\droidarm64"/>
|
||||
+
|
||||
+ <file src="build\react-ndk\all\x86_64\libglog.so" target="lib\droidx64"/>
|
||||
+ <file src="build\react-ndk\all\armeabi-v7a\libglog.so" target="lib\droidarm"/>
|
||||
+ <file src="build\react-ndk\all\x86\libglog.so" target="lib\droidx86"/>
|
||||
+ <file src="build\react-ndk\all\arm64-v8a\libglog.so" target="lib\droidarm64"/>
|
||||
+
|
||||
+ <file src="build\react-ndk\all\x86_64\libglog_init.so" target="lib\droidx64"/>
|
||||
+ <file src="build\react-ndk\all\armeabi-v7a\libglog_init.so" target="lib\droidarm"/>
|
||||
+ <file src="build\react-ndk\all\x86\libglog_init.so" target="lib\droidx86"/>
|
||||
+ <file src="build\react-ndk\all\arm64-v8a\libglog_init.so" target="lib\droidarm64"/>
|
||||
+
|
||||
+ <file src="build\react-ndk\all\x86_64\libjsinspector.so" target="lib\droidx64"/>
|
||||
+ <file src="build\react-ndk\all\armeabi-v7a\libjsinspector.so" target="lib\droidarm"/>
|
||||
+ <file src="build\react-ndk\all\x86\libjsinspector.so" target="lib\droidx86"/>
|
||||
+ <file src="build\react-ndk\all\arm64-v8a\libjsinspector.so" target="lib\droidarm64"/>
|
||||
+
|
||||
+ <file src="build\react-ndk\all\x86_64\libreactnativejni.so" target="lib\droidx64"/>
|
||||
+ <file src="build\react-ndk\all\armeabi-v7a\libreactnativejni.so" target="lib\droidarm"/>
|
||||
+ <file src="build\react-ndk\all\x86\libreactnativejni.so" target="lib\droidx86"/>
|
||||
+ <file src="build\react-ndk\all\arm64-v8a\libreactnativejni.so" target="lib\droidarm64"/>
|
||||
+
|
||||
+ <file src="build\react-ndk\all\x86_64\libv8executor.so" target="lib\droidx64"/>
|
||||
+ <file src="build\react-ndk\all\armeabi-v7a\libv8executor.so" target="lib\droidarm"/>
|
||||
+ <file src="build\react-ndk\all\x86\libv8executor.so" target="lib\droidx86"/>
|
||||
+ <file src="build\react-ndk\all\arm64-v8a\libv8executor.so" target="lib\droidarm64"/>
|
||||
+
|
||||
+ <file src="build\react-ndk\all\x86_64\libyoga.so" target="lib\droidx64"/>
|
||||
+ <file src="build\react-ndk\all\armeabi-v7a\libyoga.so" target="lib\droidarm"/>
|
||||
+ <file src="build\react-ndk\all\x86\libyoga.so" target="lib\droidx86"/>
|
||||
+ <file src="build\react-ndk\all\arm64-v8a\libyoga.so" target="lib\droidarm64"/>
|
||||
+
|
||||
+ <file src="build\react-ndk\all\x86_64\libyoga.so" target="lib\droidx64"/>
|
||||
+ <file src="build\react-ndk\all\armeabi-v7a\libyoga.so" target="lib\droidarm"/>
|
||||
+ <file src="build\react-ndk\all\x86\libyoga.so" target="lib\droidx86"/>
|
||||
+ <file src="build\react-ndk\all\arm64-v8a\libyoga.so" target="lib\droidarm64"/>
|
||||
+
|
||||
+ <!-- Unstripped binaries -->
|
||||
+ <file src="build\tmp\buildReactNdkLib\local\x86_64\libfb.so" target="lib\droidx64\unstripped"/>
|
||||
+ <file src="build\tmp\buildReactNdkLib\local\armeabi-v7a\libfb.so" target="lib\droidarm\unstripped"/>
|
||||
+ <file src="build\tmp\buildReactNdkLib\local\x86\libfb.so" target="lib\droidx86\unstripped"/>
|
||||
+ <file src="build\tmp\buildReactNdkLib\local\arm64-v8a\libfb.so" target="lib\droidarm64\unstripped"/>
|
||||
+
|
||||
+ <file src="build\tmp\buildReactNdkLib\local\x86_64\libfolly_json.so" target="lib\droidx64\unstripped"/>
|
||||
+ <file src="build\tmp\buildReactNdkLib\local\armeabi-v7a\libfolly_json.so" target="lib\droidarm\unstripped"/>
|
||||
+ <file src="build\tmp\buildReactNdkLib\local\x86\libfolly_json.so" target="lib\droidx86\unstripped"/>
|
||||
+ <file src="build\tmp\buildReactNdkLib\local\arm64-v8a\libfolly_json.so" target="lib\droidarm64\unstripped"/>
|
||||
+
|
||||
+ <file src="build\tmp\buildReactNdkLib\local\x86_64\libglog.so" target="lib\droidx64\unstripped"/>
|
||||
+ <file src="build\tmp\buildReactNdkLib\local\armeabi-v7a\libglog.so" target="lib\droidarm\unstripped"/>
|
||||
+ <file src="build\tmp\buildReactNdkLib\local\x86\libglog.so" target="lib\droidx86\unstripped"/>
|
||||
+ <file src="build\tmp\buildReactNdkLib\local\arm64-v8a\libglog.so" target="lib\droidarm64\unstripped"/>
|
||||
+
|
||||
+ <file src="build\tmp\buildReactNdkLib\local\x86_64\libglog_init.so" target="lib\droidx64\unstripped"/>
|
||||
+ <file src="build\tmp\buildReactNdkLib\local\armeabi-v7a\libglog_init.so" target="lib\droidarm\unstripped"/>
|
||||
+ <file src="build\tmp\buildReactNdkLib\local\x86\libglog_init.so" target="lib\droidx86\unstripped"/>
|
||||
+ <file src="build\tmp\buildReactNdkLib\local\arm64-v8a\libglog_init.so" target="lib\droidarm64\unstripped"/>
|
||||
+
|
||||
+ <file src="build\tmp\buildReactNdkLib\local\x86_64\libjsinspector.so" target="lib\droidx64\unstripped"/>
|
||||
+ <file src="build\tmp\buildReactNdkLib\local\armeabi-v7a\libjsinspector.so" target="lib\droidarm\unstripped"/>
|
||||
+ <file src="build\tmp\buildReactNdkLib\local\x86\libjsinspector.so" target="lib\droidx86\unstripped"/>
|
||||
+ <file src="build\tmp\buildReactNdkLib\local\arm64-v8a\libjsinspector.so" target="lib\droidarm64\unstripped"/>
|
||||
+
|
||||
+ <file src="build\tmp\buildReactNdkLib\local\x86_64\libreactnativejni.so" target="lib\droidx64\unstripped"/>
|
||||
+ <file src="build\tmp\buildReactNdkLib\local\armeabi-v7a\libreactnativejni.so" target="lib\droidarm\unstripped"/>
|
||||
+ <file src="build\tmp\buildReactNdkLib\local\x86\libreactnativejni.so" target="lib\droidx86\unstripped"/>
|
||||
+ <file src="build\tmp\buildReactNdkLib\local\arm64-v8a\libreactnativejni.so" target="lib\droidarm64\unstripped"/>
|
||||
+
|
||||
+ <file src="build\tmp\buildReactNdkLib\local\x86_64\libv8executor.so" target="lib\droidx64\unstripped"/>
|
||||
+ <file src="build\tmp\buildReactNdkLib\local\armeabi-v7a\libv8executor.so" target="lib\droidarm\unstripped"/>
|
||||
+ <file src="build\tmp\buildReactNdkLib\local\x86\libv8executor.so" target="lib\droidx86\unstripped"/>
|
||||
+ <file src="build\tmp\buildReactNdkLib\local\arm64-v8a\libv8executor.so" target="lib\droidarm64\unstripped"/>
|
||||
+
|
||||
+ <file src="build\tmp\buildReactNdkLib\local\x86_64\libyoga.so" target="lib\droidx64\unstripped"/>
|
||||
+ <file src="build\tmp\buildReactNdkLib\local\armeabi-v7a\libyoga.so" target="lib\droidarm\unstripped"/>
|
||||
+ <file src="build\tmp\buildReactNdkLib\local\x86\libyoga.so" target="lib\droidx86\unstripped"/>
|
||||
+ <file src="build\tmp\buildReactNdkLib\local\arm64-v8a\libyoga.so" target="lib\droidarm64\unstripped"/>
|
||||
+
|
||||
+ <file src="build\tmp\buildReactNdkLib\local\x86_64\libyoga.so" target="lib\droidx64\unstripped"/>
|
||||
+ <file src="build\tmp\buildReactNdkLib\local\armeabi-v7a\libyoga.so" target="lib\droidarm\unstripped"/>
|
||||
+ <file src="build\tmp\buildReactNdkLib\local\x86\libyoga.so" target="lib\droidx86\unstripped"/>
|
||||
+ <file src="build\tmp\buildReactNdkLib\local\arm64-v8a\libyoga.so" target="lib\droidarm64\unstripped"/>
|
||||
+
|
||||
+ <!-- AAR and POM -->
|
||||
+ <file src="..\android\com\facebook\react\react-native\*\react-native-*.aar" target="lib"/>
|
||||
+ <file src="..\android\com\facebook\react\react-native\*\react-native-*.pom" target="lib"/>
|
||||
+
|
||||
+ <!-- Headers, ideally we'd only exported the needed headers, not the complete list -->
|
||||
+ <file src="..\double-conversion\double-conversion\*.h" target="inc\double-conversion"/>
|
||||
+ <file src="..\ReactCommon\cxxreact\**\*.h" target="inc\cxxreact"/>
|
||||
+ <file src="..\ReactCommon\jsi\**\*.h" target="inc\jsi"/>
|
||||
+ <file src="..\ReactCommon\yoga\yoga\**\*.h" target="inc\Yoga"/>
|
||||
+ <file src="..\folly\**\*.*" target="inc" />
|
||||
+ <file src="..\glog\src\glog\*.h" target="inc\glog" />
|
||||
+ <file src="..\jsc\jsc-headers\*.h" target="inc\jsc"/>
|
||||
+ </files>
|
||||
+</package>
|
||||
+
|
|
@ -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) {
|
|
@ -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 @@
|
||||
+<?xml version="1.0" encoding="utf-8"?>
|
||||
+<packages>
|
||||
+ <package id="boost" version="1.68.0.0" targetFramework="native" />
|
||||
+ <package id="ReactNative.V8.Android" version="7.0.276.32-v1" targetFramework="native" />
|
||||
+</packages>
|
Загрузка…
Ссылка в новой задаче