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
microsoft · Oct 22, 2021 · 8960e85 · 8960e85
1 parent 9e89136
commit 8960e85
Show file tree

Hide file tree

Showing 6 changed files with 96 additions and 38 deletions.
diff --git a/.ado/android-pr.yml b/.ado/android-pr.yml
@@ -74,10 +74,24 @@ jobs:
           SYSTEM_ACCESSTOKEN: $(System.AccessToken)
           githubApiToken: $(githubApiToken)
 
-      - task: CmdLine@2
-        displayName: gradlew clean
-        inputs:
-          script: ./gradlew clean
+#     In RN64 "clean" task tries to run the build again. It is reproing in 0.64-stable branch but fixed in 0.65-stable.
+#     I can't zero on the exact cause .. but turns out the issue is with rntester clean task.
+#     
+#     mganandraj@RNDroid:~/github/rnm-64$ ./gradlew :packages:rn-tester:android:app:clean --dry-run
+#     :packages:react-native-codegen:android:buildCodegenCLI SKIPPED
+#     :packages:rn-tester:android:app:generateCodegenSchemaFromJavaScript SKIPPED
+#     :packages:rn-tester:android:app:generateCodegenArtifactsFromSchema SKIPPED
+#     :ReactAndroid:extractAARHeaders SKIPPED
+#     :ReactAndroid:extractJNIFiles SKIPPED
+#     :ReactAndroid:generateCodegenSchemaFromJavaScript SKIPPED
+#     :ReactAndroid:generateCodegenArtifactsFromSchema SKIPPED
+#     :ReactAndroid:prepareBoost SKIPPED
+#     :ReactAndroid:createNativeDepsDirectories SKIPPED
+#     ..
+#      - task: CmdLine@2
+#        displayName: gradlew clean
+#        inputs:
+#          script: ./gradlew clean
 
       - task: PublishBuildArtifacts@1
         displayName: 'Publish final artifacts'

diff --git a/.ado/templates/android-build-office.yml b/.ado/templates/android-build-office.yml
@@ -30,12 +30,29 @@ steps:
     inputs:
       script: yarn install --frozen-lockfile
 
+  # scripts/bump-oss-version.js
+  #
+  # update the following files to the commit id.
+  # package.json (-> npm package version)
+  # gradle.properties (-> aar version)
+  # gradle.properties (-> aar version)
+  #
+  # The following files are updated for runtime version checking.
+  # ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java
+  # React/Base/RCTVersion.m
+  # ReactCommon/cxxreact/ReactNativeVersion.h
+  # Libraries/Core/ReactNativeVersion.js
+  #
+  # --nightly => version = `0.0.0-${currentCommit.slice(0, 9)}`;
+  # When on master branch or non-stable branch.
   - task: CmdLine@2
     displayName: Bump canary package version
     inputs:
       script: node scripts/bump-oss-version.js --nightly
-    condition: eq(variables['Build.SourceBranchName'], 'master')
-
+    condition: or(eq(variables['Build.SourceBranchName'], 'master'), not(contains(variables['Build.SourceBranchName'], '-stable')))
+
+  # 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.
+
   - task: CmdLine@2
     displayName: nuget restore
     inputs:

diff --git 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) Build OfficeRNHost V8 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 MAC --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/Build/ReactAndroid/ReactAndroid.nuspec b/android-patches/patches/Build/ReactAndroid/ReactAndroid.nuspec
@@ -1,6 +1,6 @@
 --- "E:\\gh\\react-native-macos2\\ReactAndroid\\ReactAndroid.nuspec"	1969-12-31 16:00:00.000000000 -0800
-+++ "E:\\gh\\react-native-macos\\ReactAndroid\\ReactAndroid.nuspec"	2021-10-12 19:48:38.934480100 -0700
-@@ -0,0 +1,200 @@
++++ "E:\\gh\\react-native-macos\\ReactAndroid\\ReactAndroid.nuspec"	2021-10-16 13:47:24.356639200 -0700
+@@ -0,0 +1,242 @@
 +<?xml version="1.0" encoding="utf-8"?>
 +<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 +  <metadata>
@@ -100,6 +100,26 @@
 +    <file src="build\react-ndk\all\x86\libfolly_futures.so" target="lib\droidx86"/>
 +    <file src="build\react-ndk\all\arm64-v8a\libfolly_futures.so" target="lib\droidarm64"/>
 +
++    <file src="build\react-ndk\all\x86_64\libreact_nativemodule_core.so" target="lib\droidx64"/>
++    <file src="build\react-ndk\all\armeabi-v7a\libreact_nativemodule_core.so" target="lib\droidarm"/>
++    <file src="build\react-ndk\all\x86\libreact_nativemodule_core.so" target="lib\droidx86"/>
++    <file src="build\react-ndk\all\arm64-v8a\libreact_nativemodule_core.so" target="lib\droidarm64"/>
++
++    <file src="build\react-ndk\all\x86_64\libreactnativeutilsjni.so" target="lib\droidx64"/>
++    <file src="build\react-ndk\all\armeabi-v7a\libreactnativeutilsjni.so" target="lib\droidarm"/>
++    <file src="build\react-ndk\all\x86\libreactnativeutilsjni.so" target="lib\droidx86"/>
++    <file src="build\react-ndk\all\arm64-v8a\libreactnativeutilsjni.so" target="lib\droidarm64"/>
++
++    <file src="build\react-ndk\all\x86_64\libreactperfloggerjni.so" target="lib\droidx64"/>
++    <file src="build\react-ndk\all\armeabi-v7a\libreactperfloggerjni.so" target="lib\droidarm"/>
++    <file src="build\react-ndk\all\x86\libreactperfloggerjni.so" target="lib\droidx86"/>
++    <file src="build\react-ndk\all\arm64-v8a\libreactperfloggerjni.so" target="lib\droidarm64"/>
++
++    <file src="build\react-ndk\all\x86_64\libturbomodulejsijni.so" target="lib\droidx64"/>
++    <file src="build\react-ndk\all\armeabi-v7a\libturbomodulejsijni.so" target="lib\droidarm"/>
++    <file src="build\react-ndk\all\x86\libturbomodulejsijni.so" target="lib\droidx86"/>
++    <file src="build\react-ndk\all\arm64-v8a\libturbomodulejsijni.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"/>
@@ -185,16 +205,38 @@
 +    <file src="build\tmp\buildReactNdkLib\local\armeabi-v7a\libfolly_futures.so" target="lib\droidarm\unstripped"/>
 +    <file src="build\tmp\buildReactNdkLib\local\x86\libfolly_futures.so" target="lib\droidx86\unstripped"/>
 +    <file src="build\tmp\buildReactNdkLib\local\arm64-v8a\libfolly_futures.so" target="lib\droidarm64\unstripped"/>
++
++    <file src="build\tmp\buildReactNdkLib\local\x86_64\libreact_nativemodule_core.so" target="lib\droidx64\unstripped"/>
++    <file src="build\tmp\buildReactNdkLib\local\armeabi-v7a\libreact_nativemodule_core.so" target="lib\droidarm\unstripped"/>
++    <file src="build\tmp\buildReactNdkLib\local\x86\libreact_nativemodule_core.so" target="lib\droidx86\unstripped"/>
++    <file src="build\tmp\buildReactNdkLib\local\arm64-v8a\libreact_nativemodule_core.so" target="lib\droidarm64\unstripped"/>
++
++    <file src="build\tmp\buildReactNdkLib\local\x86_64\libreactnativeutilsjni.so" target="lib\droidx64\unstripped"/>
++    <file src="build\tmp\buildReactNdkLib\local\armeabi-v7a\libreactnativeutilsjni.so" target="lib\droidarm\unstripped"/>
++    <file src="build\tmp\buildReactNdkLib\local\x86\libreactnativeutilsjni.so" target="lib\droidx86\unstripped"/>
++    <file src="build\tmp\buildReactNdkLib\local\arm64-v8a\libreactnativeutilsjni.so" target="lib\droidarm64\unstripped"/>
++
++    <file src="build\tmp\buildReactNdkLib\local\x86_64\libreactperfloggerjni.so" target="lib\droidx64\unstripped"/>
++    <file src="build\tmp\buildReactNdkLib\local\armeabi-v7a\libreactperfloggerjni.so" target="lib\droidarm\unstripped"/>
++    <file src="build\tmp\buildReactNdkLib\local\x86\libreactperfloggerjni.so" target="lib\droidx86\unstripped"/>
++    <file src="build\tmp\buildReactNdkLib\local\arm64-v8a\libreactperfloggerjni.so" target="lib\droidarm64\unstripped"/>
++
++    <file src="build\tmp\buildReactNdkLib\local\x86_64\libturbomodulejsijni.so" target="lib\droidx64\unstripped"/>
++    <file src="build\tmp\buildReactNdkLib\local\armeabi-v7a\libturbomodulejsijni.so" target="lib\droidarm\unstripped"/>
++    <file src="build\tmp\buildReactNdkLib\local\x86\libturbomodulejsijni.so" target="lib\droidx86\unstripped"/>
++    <file src="build\tmp\buildReactNdkLib\local\arm64-v8a\libturbomodulejsijni.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"/>
++    <file src="..\android\com\**\*" target="maven\com"/>
 +
 +    <!-- Headers, ideally we'd only exported the needed headers, not the complete list -->
 +    <file src=".\build\third-party-ndk\double-conversion\double-conversion\*.h" target="inc\double-conversion"/>
 +    <file src=".\build\third-party-ndk\folly\**\*.*" target="inc" />
 +    <file src=".\build\third-party-ndk\glog\exported\glog\*.h" target="inc\glog" />
 +    <file src=".\build\third-party-ndk\jsc\JavaScriptCore\*.h" target="inc\jsc"/>
 +    <file src="..\ReactCommon\cxxreact\**\*.h" target="inc\cxxreact"/>
++    <file src="..\ReactCommon\runtimeexecutor\ReactCommon\*.h" target="inc\ReactCommon"/>
++    <file src="..\ReactCommon\callinvoker\ReactCommon\*.h" target="inc\ReactCommon"/>
 +    <file src="..\ReactCommon\jsi\**\*.h" target="inc\jsi"/>
 +    <file src="..\ReactCommon\yoga\yoga\**\*.h" target="inc\Yoga"/>
 +    <file src="..\android\dependencies\**\*.*" target="dependencies"/>

diff --git a/...es/MAC/ReactAndroid/src/main/java/com/facebook/react/modules/debug/DevSettingsModule.java b/...es/MAC/ReactAndroid/src/main/java/com/facebook/react/modules/debug/DevSettingsModule.java
@@ -0,0 +1,12 @@
+--- "E:\\gh\\react-native-macos2\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\modules\\debug\\DevSettingsModule.java"	2021-08-31 19:52:47.502468000 -0700
++++ "E:\\gh\\react-native-macos\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\modules\\debug\\DevSettingsModule.java"	2021-10-20 19:29:11.611192200 -0700
+@@ -118,4 +118,9 @@
+   public void removeListeners(double count) {
+     // iOS only
+   }
++
++  @Override
++  public void setIsSecondaryClickToShowDevMenuEnabled(boolean enabled) {
++    // macOS only.
++  }
+ }
diff --git a/...atches/OfficeRNHost/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactBridge.java b/...atches/OfficeRNHost/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactBridge.java