Skip to content

Commit 8960e85

Browse files
mganandrajmganandraj
authored
Some more changes for bringing up RN64 in devmain Android (#861)
* Build & Packaging changes for bringing up RN64 in devmain * Fixing gradle clean * Disable gradle clean in PR builds
1 parent 9e89136 commit 8960e85

File tree

6 files changed

+96
-38
lines changed

6 files changed

+96
-38
lines changed

‎.ado/android-pr.yml

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,24 @@ jobs:
7474
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
7575
githubApiToken: $(githubApiToken)
7676

77-
- task: CmdLine@2
78-
displayName: gradlew clean
79-
inputs:
80-
script: ./gradlew clean
77+
# In RN64 "clean" task tries to run the build again. It is reproing in 0.64-stable branch but fixed in 0.65-stable.
78+
# I can't zero on the exact cause .. but turns out the issue is with rntester clean task.
79+
#
80+
# mganandraj@RNDroid:~/github/rnm-64$ ./gradlew :packages:rn-tester:android:app:clean --dry-run
81+
# :packages:react-native-codegen:android:buildCodegenCLI SKIPPED
82+
# :packages:rn-tester:android:app:generateCodegenSchemaFromJavaScript SKIPPED
83+
# :packages:rn-tester:android:app:generateCodegenArtifactsFromSchema SKIPPED
84+
# :ReactAndroid:extractAARHeaders SKIPPED
85+
# :ReactAndroid:extractJNIFiles SKIPPED
86+
# :ReactAndroid:generateCodegenSchemaFromJavaScript SKIPPED
87+
# :ReactAndroid:generateCodegenArtifactsFromSchema SKIPPED
88+
# :ReactAndroid:prepareBoost SKIPPED
89+
# :ReactAndroid:createNativeDepsDirectories SKIPPED
90+
# ..
91+
# - task: CmdLine@2
92+
# displayName: gradlew clean
93+
# inputs:
94+
# script: ./gradlew clean
8195

8296
- task: PublishBuildArtifacts@1
8397
displayName: 'Publish final artifacts'

‎.ado/templates/android-build-office.yml

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,29 @@ steps:
3030
inputs:
3131
script: yarn install --frozen-lockfile
3232

33+
# scripts/bump-oss-version.js
34+
#
35+
# update the following files to the commit id.
36+
# package.json (-> npm package version)
37+
# gradle.properties (-> aar version)
38+
# gradle.properties (-> aar version)
39+
#
40+
# The following files are updated for runtime version checking.
41+
# ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java
42+
# React/Base/RCTVersion.m
43+
# ReactCommon/cxxreact/ReactNativeVersion.h
44+
# Libraries/Core/ReactNativeVersion.js
45+
#
46+
# --nightly => version = `0.0.0-${currentCommit.slice(0, 9)}`;
47+
# When on master branch or non-stable branch.
3348
- task: CmdLine@2
3449
displayName: Bump canary package version
3550
inputs:
3651
script: node scripts/bump-oss-version.js --nightly
37-
condition: eq(variables['Build.SourceBranchName'], 'master')
38-
52+
condition: or(eq(variables['Build.SourceBranchName'], 'master'), not(contains(variables['Build.SourceBranchName'], '-stable')))
53+
54+
# TODO: We don't seem to be running bump-oss-version.js for stable branches, hence we would end up publishing using the values in the repository.
55+
3956
- task: CmdLine@2
4057
displayName: nuget restore
4158
inputs:

‎.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) Build OfficeRNHost V8 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 MAC --patch-store $(System.DefaultWorkingDirectory)/android-patches/patches --log-folder $(System.DefaultWorkingDirectory)/android-patches/logs --confirm ${{ parameters.apply_office_patches }}

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

Lines changed: 46 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- "E:\\gh\\react-native-macos2\\ReactAndroid\\ReactAndroid.nuspec" 1969-12-31 16:00:00.000000000 -0800
2-
+++ "E:\\gh\\react-native-macos\\ReactAndroid\\ReactAndroid.nuspec" 2021-10-12 19:48:38.934480100 -0700
3-
@@ -0,0 +1,200 @@
2+
+++ "E:\\gh\\react-native-macos\\ReactAndroid\\ReactAndroid.nuspec" 2021-10-16 13:47:24.356639200 -0700
3+
@@ -0,0 +1,242 @@
44
+<?xml version="1.0" encoding="utf-8"?>
55
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
66
+ <metadata>
@@ -100,6 +100,26 @@
100100
+ <file src="build\react-ndk\all\x86\libfolly_futures.so" target="lib\droidx86"/>
101101
+ <file src="build\react-ndk\all\arm64-v8a\libfolly_futures.so" target="lib\droidarm64"/>
102102
+
103+
+ <file src="build\react-ndk\all\x86_64\libreact_nativemodule_core.so" target="lib\droidx64"/>
104+
+ <file src="build\react-ndk\all\armeabi-v7a\libreact_nativemodule_core.so" target="lib\droidarm"/>
105+
+ <file src="build\react-ndk\all\x86\libreact_nativemodule_core.so" target="lib\droidx86"/>
106+
+ <file src="build\react-ndk\all\arm64-v8a\libreact_nativemodule_core.so" target="lib\droidarm64"/>
107+
+
108+
+ <file src="build\react-ndk\all\x86_64\libreactnativeutilsjni.so" target="lib\droidx64"/>
109+
+ <file src="build\react-ndk\all\armeabi-v7a\libreactnativeutilsjni.so" target="lib\droidarm"/>
110+
+ <file src="build\react-ndk\all\x86\libreactnativeutilsjni.so" target="lib\droidx86"/>
111+
+ <file src="build\react-ndk\all\arm64-v8a\libreactnativeutilsjni.so" target="lib\droidarm64"/>
112+
+
113+
+ <file src="build\react-ndk\all\x86_64\libreactperfloggerjni.so" target="lib\droidx64"/>
114+
+ <file src="build\react-ndk\all\armeabi-v7a\libreactperfloggerjni.so" target="lib\droidarm"/>
115+
+ <file src="build\react-ndk\all\x86\libreactperfloggerjni.so" target="lib\droidx86"/>
116+
+ <file src="build\react-ndk\all\arm64-v8a\libreactperfloggerjni.so" target="lib\droidarm64"/>
117+
+
118+
+ <file src="build\react-ndk\all\x86_64\libturbomodulejsijni.so" target="lib\droidx64"/>
119+
+ <file src="build\react-ndk\all\armeabi-v7a\libturbomodulejsijni.so" target="lib\droidarm"/>
120+
+ <file src="build\react-ndk\all\x86\libturbomodulejsijni.so" target="lib\droidx86"/>
121+
+ <file src="build\react-ndk\all\arm64-v8a\libturbomodulejsijni.so" target="lib\droidarm64"/>
122+
+
103123
+ <!-- Unstripped binaries -->
104124
+ <file src="build\tmp\buildReactNdkLib\local\x86_64\libfb.so" target="lib\droidx64\unstripped"/>
105125
+ <file src="build\tmp\buildReactNdkLib\local\armeabi-v7a\libfb.so" target="lib\droidarm\unstripped"/>
@@ -185,16 +205,38 @@
185205
+ <file src="build\tmp\buildReactNdkLib\local\armeabi-v7a\libfolly_futures.so" target="lib\droidarm\unstripped"/>
186206
+ <file src="build\tmp\buildReactNdkLib\local\x86\libfolly_futures.so" target="lib\droidx86\unstripped"/>
187207
+ <file src="build\tmp\buildReactNdkLib\local\arm64-v8a\libfolly_futures.so" target="lib\droidarm64\unstripped"/>
208+
+
209+
+ <file src="build\tmp\buildReactNdkLib\local\x86_64\libreact_nativemodule_core.so" target="lib\droidx64\unstripped"/>
210+
+ <file src="build\tmp\buildReactNdkLib\local\armeabi-v7a\libreact_nativemodule_core.so" target="lib\droidarm\unstripped"/>
211+
+ <file src="build\tmp\buildReactNdkLib\local\x86\libreact_nativemodule_core.so" target="lib\droidx86\unstripped"/>
212+
+ <file src="build\tmp\buildReactNdkLib\local\arm64-v8a\libreact_nativemodule_core.so" target="lib\droidarm64\unstripped"/>
213+
+
214+
+ <file src="build\tmp\buildReactNdkLib\local\x86_64\libreactnativeutilsjni.so" target="lib\droidx64\unstripped"/>
215+
+ <file src="build\tmp\buildReactNdkLib\local\armeabi-v7a\libreactnativeutilsjni.so" target="lib\droidarm\unstripped"/>
216+
+ <file src="build\tmp\buildReactNdkLib\local\x86\libreactnativeutilsjni.so" target="lib\droidx86\unstripped"/>
217+
+ <file src="build\tmp\buildReactNdkLib\local\arm64-v8a\libreactnativeutilsjni.so" target="lib\droidarm64\unstripped"/>
218+
+
219+
+ <file src="build\tmp\buildReactNdkLib\local\x86_64\libreactperfloggerjni.so" target="lib\droidx64\unstripped"/>
220+
+ <file src="build\tmp\buildReactNdkLib\local\armeabi-v7a\libreactperfloggerjni.so" target="lib\droidarm\unstripped"/>
221+
+ <file src="build\tmp\buildReactNdkLib\local\x86\libreactperfloggerjni.so" target="lib\droidx86\unstripped"/>
222+
+ <file src="build\tmp\buildReactNdkLib\local\arm64-v8a\libreactperfloggerjni.so" target="lib\droidarm64\unstripped"/>
223+
+
224+
+ <file src="build\tmp\buildReactNdkLib\local\x86_64\libturbomodulejsijni.so" target="lib\droidx64\unstripped"/>
225+
+ <file src="build\tmp\buildReactNdkLib\local\armeabi-v7a\libturbomodulejsijni.so" target="lib\droidarm\unstripped"/>
226+
+ <file src="build\tmp\buildReactNdkLib\local\x86\libturbomodulejsijni.so" target="lib\droidx86\unstripped"/>
227+
+ <file src="build\tmp\buildReactNdkLib\local\arm64-v8a\libturbomodulejsijni.so" target="lib\droidarm64\unstripped"/>
228+
+
188229
+ <!-- AAR and POM -->
189-
+ <file src="..\android\com\facebook\react\react-native\*\react-native-*.aar" target="lib"/>
190-
+ <file src="..\android\com\facebook\react\react-native\*\react-native-*.pom" target="lib"/>
230+
+ <file src="..\android\com\**\*" target="maven\com"/>
191231
+
192232
+ <!-- Headers, ideally we'd only exported the needed headers, not the complete list -->
193233
+ <file src=".\build\third-party-ndk\double-conversion\double-conversion\*.h" target="inc\double-conversion"/>
194234
+ <file src=".\build\third-party-ndk\folly\**\*.*" target="inc" />
195235
+ <file src=".\build\third-party-ndk\glog\exported\glog\*.h" target="inc\glog" />
196236
+ <file src=".\build\third-party-ndk\jsc\JavaScriptCore\*.h" target="inc\jsc"/>
197237
+ <file src="..\ReactCommon\cxxreact\**\*.h" target="inc\cxxreact"/>
238+
+ <file src="..\ReactCommon\runtimeexecutor\ReactCommon\*.h" target="inc\ReactCommon"/>
239+
+ <file src="..\ReactCommon\callinvoker\ReactCommon\*.h" target="inc\ReactCommon"/>
198240
+ <file src="..\ReactCommon\jsi\**\*.h" target="inc\jsi"/>
199241
+ <file src="..\ReactCommon\yoga\yoga\**\*.h" target="inc\Yoga"/>
200242
+ <file src="..\android\dependencies\**\*.*" target="dependencies"/>

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
--- "E:\\gh\\react-native-macos2\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\modules\\debug\\DevSettingsModule.java" 2021-08-31 19:52:47.502468000 -0700
2+
+++ "E:\\gh\\react-native-macos\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\modules\\debug\\DevSettingsModule.java" 2021-10-20 19:29:11.611192200 -0700
3+
@@ -118,4 +118,9 @@
4+
public void removeListeners(double count) {
5+
// iOS only
6+
}
7+
+
8+
+ @Override
9+
+ public void setIsSecondaryClickToShowDevMenuEnabled(boolean enabled) {
10+
+ // macOS only.
11+
+ }
12+
}

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

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

0 commit comments

Comments
 (0)