Skip to content

Commit 43d00a6

Browse files
committed
(1)Rebased relevant patches over RN63 codebase (2) Removed the dependencies on checked-in version of folly, glog & double-conversion
1 parent c4f4144 commit 43d00a6

File tree

53 files changed

+290
-592
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+290
-592
lines changed

.ado/android-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
- task: CmdLine@2
4343
displayName: gradlew installArchives
4444
inputs:
45-
script: REACT_NATIVE_DEPENDENCIES=$(System.DefaultWorkingDirectory)/build_deps ./gradlew installArchives -Pparam="excludeLibs"
45+
script: REACT_NATIVE_BOOST_PATH=$(System.DefaultWorkingDirectory)/build_deps ./gradlew installArchives -Pparam="excludeLibs"
4646

4747
- template: templates\prep-android-nuget.yml
4848

.ado/npmOfficePack.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ function doPublish(fakeMode) {
2727
const onlyTagSource = !!branchVersionSuffix;
2828
if (!onlyTagSource) {
2929
// -------- Generating Android Artifacts with JavaDoc
30-
const depsEnvPrefix = "REACT_NATIVE_DEPENDENCIES=" + path.join(process.env.BUILD_SOURCESDIRECTORY, "build_deps");
30+
const depsEnvPrefix = "REACT_NATIVE_BOOST_PATH=" + path.join(process.env.BUILD_SOURCESDIRECTORY, "build_deps");
3131
const gradleCommand = path.join(process.env.BUILD_SOURCESDIRECTORY, "gradlew") + " installArchives";
3232
exec( depsEnvPrefix + " " + gradleCommand );
3333

.ado/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ jobs:
140140
- task: CmdLine@2
141141
displayName: gradlew installArchives
142142
inputs:
143-
script: REACT_NATIVE_DEPENDENCIES=$(System.DefaultWorkingDirectory)/build_deps ./gradlew installArchives -Pparam="excludeLibs"
143+
script: REACT_NATIVE_BOOST_PATH=$(System.DefaultWorkingDirectory)/build_deps ./gradlew installArchives -Pparam="excludeLibs"
144144

145145
- template: templates\prep-android-nuget.yml
146146

.ado/setup_droid_deps.bat

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,8 @@ IF EXIST %BUILD_DEPS_DIR% (
1111

1212
mkdir %BUILD_DEPS_DIR%
1313

14-
mkdir %BUILD_DEPS_DIR%\boost_1_63_0
15-
mklink /D /J %BUILD_DEPS_DIR%\boost_1_63_0\boost ReactAndroid\packages\boost.1.68.0.0\lib\native\include\boost
16-
17-
mkdir %BUILD_DEPS_DIR%\double-conversion-1.1.6
18-
mklink /D /J %BUILD_DEPS_DIR%\double-conversion-1.1.6\src double-conversion\double-conversion
19-
mklink /D /J %BUILD_DEPS_DIR%\folly-2018.10.22.00 Folly\
20-
mklink /D /J %BUILD_DEPS_DIR%\glog-0.3.5 glog
14+
mkdir %BUILD_DEPS_DIR%\boost_1_68_0
15+
mklink /D /J %BUILD_DEPS_DIR%\boost_1_68_0\boost ReactAndroid\packages\boost.1.68.0.0\lib\native\include\boost
2116

2217
REM When setting up locally, set the environement variable as follows.
23-
REM set REACT_NATIVE_DEPENDENCIES=%CD%\%BUILD_DEPS_DIR%
18+
REM set REACT_NATIVE_BOOST_PATH=%CD%\%BUILD_DEPS_DIR%

.ado/setup_droid_deps.sh

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,4 @@ mkdir $BUILD_DEPS_DIR
77

88
mkdir $BUILD_DEPS_DIR/boost_1_68_0
99
ln -s "$PWD/ReactAndroid/packages/boost.1.68.0.0/lib/native/include/boost" "$BUILD_DEPS_DIR/boost_1_68_0/boost"
10-
11-
ln -s "$PWD/Folly" "$BUILD_DEPS_DIR/folly-2018.10.22.00"
12-
13-
mkdir $BUILD_DEPS_DIR/double-conversion-1.1.6
14-
ln -s "$PWD/double-conversion/double-conversion" "$BUILD_DEPS_DIR/double-conversion-1.1.6/src"
15-
16-
ln -s "$PWD/glog" "$BUILD_DEPS_DIR/glog-0.3.5"
17-
1810
# export REACT_NATIVE_BOOST_PATH=$BUILD_DEPS_DIR

.ado/templates/apple-droid-node-patching.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ steps:
55
- task: CmdLine@2
66
displayName: Apply Android specific patches for Office consumption
77
inputs:
8-
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 }}
8+
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 }}

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

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

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

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

android-patches/patches/BasicBuild/ReactAndroid/src/main/jni/third-party/double-conversion/Android.mk

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

android-patches/patches/BasicBuild/ReactAndroid/src/main/jni/third-party/glog/Android.mk

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

0 commit comments

Comments
 (0)