Merge pull request #1323 from rasaha91/cherry-pick-ndk-fixes

Cherry pick ndk fixes
microsoft · Aug 4, 2022 · e960741 · e960741
2 parents e6482e0 + c83c522
commit e960741
Show file tree

Hide file tree

Showing 8 changed files with 102 additions and 80 deletions.
diff --git a/.ado/android-pr.yml b/.ado/android-pr.yml
@@ -29,6 +29,8 @@ jobs:
         submodules: recursive # set to 'true' for a single level of submodules or 'recursive' to get submodules of submodules
         persistCredentials: false # set to 'true' to leave the OAuth token in the Git config after the initial fetch
 
+      - template: templates/android-build-office-setup.yml
+
       - template: templates/android-build-office.yml
 
       - template: templates/download-android-dependencies.yml

diff --git a/.ado/publish.yml b/.ado/publish.yml
@@ -195,7 +195,7 @@ jobs:
         submodules: recursive # set to 'true' for a single level of submodules or 'recursive' to get submodules of submodules
         persistCredentials: true # set to 'true' to leave the OAuth token in the Git config after the initial fetch
 
-      - template: templates/android-build-office.yml
+      - template: templates/android-build-office-setup.yml
 
       - task: CmdLine@2
         displayName: Bump package version
@@ -208,6 +208,8 @@ jobs:
         inputs:
           script: node .ado/removeWorkspaceConfig.js
 
+      - template: templates/android-build-office.yml
+
       # Enumerate and download all dependencies ..
       - template: templates/download-android-dependencies.yml
         parameters:

diff --git a/.ado/templates/android-build-office-setup.yml b/.ado/templates/android-build-office-setup.yml
@@ -0,0 +1,62 @@
+steps:
+  - task: UseNode@1
+    inputs:
+      version: '16.x'
+
+  - template: apple-droid-node-patching.yml
+    parameters:
+      apply_office_patches: true
+
+  # Install NuGet
+  - task: CmdLine@2
+    displayName: Install NuGet
+    inputs:
+      script: curl -o $(System.DefaultWorkingDirectory)/nuget-bin/nuget.exe --create-dirs https://dist.nuget.org/win-x86-commandline/latest/nuget.exe
+
+  - task: CmdLine@2
+    displayName: "Rename package to react-native"
+    inputs:
+      script: node .ado/renamePackageForOffice.js
+
+  - task: CmdLine@2
+    displayName: yarn install
+    inputs:
+      script: yarn install --frozen-lockfile
+
+  # scripts/set-rn-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 --autogenerateVersionNumber => version = `0.0.0-${currentCommit.slice(0, 9)}`;
+  # When on main branch or non-stable branch.
+  - task: CmdLine@2
+    displayName: Set canary package version
+    inputs:
+      script: node scripts/set-rn-version.js --nightly --autogenerateVersionNumber --skipUpdateRuby # TODO(macOS GH#1148): Remove --skipUpdateRuby flag once we clean up version update scripts
+    condition: or(eq(variables['Build.SourceBranchName'], 'main'), not(contains(variables['Build.SourceBranchName'], '-stable')))
+
+  # TODO: We don't seem to be running set-rn-version.js for stable branches, hence we would end up publishing using the values in the repository.
+
+  - task: CmdLine@2
+    displayName: nuget restore
+    inputs:
+      script: mono $(System.DefaultWorkingDirectory)/nuget-bin/nuget.exe restore $(System.DefaultWorkingDirectory)/ReactAndroid/packages.config -PackagesDirectory  $(System.DefaultWorkingDirectory)/ReactAndroid/packages/ -Verbosity Detailed -NonInteractive
+
+  - task: CmdLine@2
+    displayName: Setup Build Dependencies
+    inputs:
+      script: chmod +x .ado/setup_droid_deps.sh && .ado/setup_droid_deps.sh
+
+  - task: CmdLine@2
+    displayName: Remove RNTesterApp.android.bundle
+    inputs:
+      script: rm -f ./packages/rn-tester/js/RNTesterApp.android.bundle
diff --git a/.ado/templates/android-build-office.yml b/.ado/templates/android-build-office.yml
@@ -1,66 +1,4 @@
 steps:
-  - task: UseNode@1
-    inputs:
-      version: '16.x'
-
-  - template: apple-droid-node-patching.yml
-    parameters:
-      apply_office_patches: true
-
-  # Install NuGet
-  - task: CmdLine@2
-    displayName: Install NuGet
-    inputs:
-      script: curl -o $(System.DefaultWorkingDirectory)/nuget-bin/nuget.exe --create-dirs https://dist.nuget.org/win-x86-commandline/latest/nuget.exe
-
-  - task: CmdLine@2
-    displayName: "Rename package to react-native"
-    inputs:
-      script: node .ado/renamePackageForOffice.js
-
-  - task: CmdLine@2
-    displayName: yarn install
-    inputs:
-      script: yarn install --frozen-lockfile
-
-  # scripts/set-rn-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 --autogenerateVersionNumber => version = `0.0.0-${currentCommit.slice(0, 9)}`;
-  # When on main branch or non-stable branch.
-  - task: CmdLine@2
-    displayName: Set canary package version
-    inputs:
-      script: node scripts/set-rn-version.js --nightly --autogenerateVersionNumber --skipUpdateRuby # TODO(macOS GH#1148): Remove --skipUpdateRuby flag once we clean up version update scripts
-    condition: or(eq(variables['Build.SourceBranchName'], 'main'), not(contains(variables['Build.SourceBranchName'], '-stable')))
-
-  # TODO: We don't seem to be running set-rn-version.js for stable branches, hence we would end up publishing using the values in the repository.
-
-  - task: CmdLine@2
-    displayName: nuget restore
-    inputs:
-      script: mono $(System.DefaultWorkingDirectory)/nuget-bin/nuget.exe restore $(System.DefaultWorkingDirectory)/ReactAndroid/packages.config -PackagesDirectory  $(System.DefaultWorkingDirectory)/ReactAndroid/packages/ -Verbosity Detailed -NonInteractive
-
-  - task: CmdLine@2
-    displayName: Setup Build Dependencies
-    inputs:
-      script: chmod +x .ado/setup_droid_deps.sh && .ado/setup_droid_deps.sh
-
-  - task: CmdLine@2
-    displayName: Remove RNTesterApp.android.bundle
-    inputs:
-      script: rm -f ./packages/rn-tester/js/RNTesterApp.android.bundle
-
   - task: CmdLine@2
     displayName: Create RNTester bundle
     inputs:

diff --git a/.ado/templates/android-nuget-pack.yml b/.ado/templates/android-nuget-pack.yml
@@ -12,4 +12,4 @@ steps:
   - task: CmdLine@2
     displayName: 'NuGet pack'
     inputs:
-      script: NDK=ndk`cat ${ANDROID_SDK_ROOT}/ndk-bundle/source.properties 2>&1 | grep Pkg.Revision | awk '{ print $3}' | awk -F. '{ print $1 }'`; mono $(System.DefaultWorkingDirectory)/nuget-bin/nuget.exe pack $(System.DefaultWorkingDirectory)/ReactAndroid/ReactAndroid.nuspec -OutputDirectory $(Build.StagingDirectory)/final -Properties buildNumber=$(buildNumber)-$NDK\;commitId=$(Build.SourceVersion)
+      script: NDK=ndk`$(System.DefaultWorkingDirectory)/gradlew -q ReactAndroid:properties | grep ndkVersion | awk '{print $2}' | awk -F. '{print $1}'`; mono $(System.DefaultWorkingDirectory)/nuget-bin/nuget.exe pack $(System.DefaultWorkingDirectory)/ReactAndroid/ReactAndroid.nuspec -OutputDirectory $(Build.StagingDirectory)/final -Properties buildNumber=$(buildNumber)-$NDK\;commitId=$(Build.SourceVersion)
diff --git a/.ado/templates/prep-android-nuget.yml b/.ado/templates/prep-android-nuget.yml
diff --git a/android-patches/patches/Build/ReactAndroid/build.gradle b/android-patches/patches/Build/ReactAndroid/build.gradle
@@ -1,6 +1,19 @@
---- ./ReactAndroid/build.gradle	2022-01-11 17:41:28.000000000 -0800
-+++ /var/folders/vs/8_b205053dddbcv7btj0w0v80000gn/T/update-1h8V3n/merge/Build/ReactAndroid/build.gradle	2022-01-12 15:51:37.000000000 -0800
-@@ -41,6 +41,8 @@
+diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle
+index 3c23c6a84b4..183bffe7164 100644
+--- a/ReactAndroid/build.gradle
++++ b/ReactAndroid/build.gradle
+@@ -12,6 +12,10 @@ plugins {
+     id("de.undercouch.download")
+ }
+
++rootProject.ext {
++    ndkVersion="21.4.7075529"
++}
++
+ import com.facebook.react.tasks.internal.*
+
+ import java.nio.file.Paths
+@@ -41,6 +45,8 @@ def dependenciesPath = System.getenv("REACT_NATIVE_DEPENDENCIES")
  // and the build will use that.
  def boostPath = dependenciesPath ?: System.getenv("REACT_NATIVE_BOOST_PATH")
 
@@ -9,7 +22,7 @@
  // Setup build type for NDK, supported values: {debug, release}
  def nativeBuildType = System.getenv("NATIVE_BUILD_TYPE") ?: "release"
 
-@@ -86,11 +88,22 @@
+@@ -86,11 +92,22 @@ task downloadFolly(dependsOn: createNativeDepsDirectories, type: Download) {
      dest(new File(downloadsDir, "folly-${FOLLY_VERSION}.tar.gz"))
  }
 
@@ -32,7 +45,7 @@
      includeEmptyDirs = false
      into("$thirdPartyNdkDir/folly")
  }
-@@ -144,6 +157,14 @@
+@@ -144,6 +161,14 @@ task prepareHermes(dependsOn: createNativeDepsDirectories, type: Copy) {
      into "$thirdPartyNdkDir/hermes"
  }
 
@@ -47,15 +60,15 @@
  task downloadGlog(dependsOn: createNativeDepsDirectories, type: Download) {
      src("https://github.com/google/glog/archive/v${GLOG_VERSION}.tar.gz")
      onlyIfNewer(true)
-@@ -292,6 +313,7 @@
+@@ -315,6 +340,7 @@ android {
                          "REACT_COMMON_DIR=$projectDir/../ReactCommon",
                          "REACT_GENERATED_SRC_DIR=$buildDir/generated/source",
                          "REACT_SRC_DIR=$projectDir/src/main/java/com/facebook/react",
 +                        "V8_NUGET_DIR=$projectDir/$V8Path",
                          "-j${ndkBuildJobs()}"
 
                  if (Os.isFamily(Os.FAMILY_MAC)) {
-@@ -311,7 +333,7 @@
+@@ -339,7 +365,7 @@ android {
          }
      }
 

diff --git a/android-patches/patches/Build/build.gradle.kts b/android-patches/patches/Build/build.gradle.kts
@@ -0,0 +1,14 @@
+diff --git a/build.gradle.kts b/build.gradle.kts
+index 4725963eae0..7c71d628832 100644
+--- a/build.gradle.kts
++++ b/build.gradle.kts
+@@ -5,9 +5,6 @@
+  * LICENSE file in the root directory of this source tree.
+  */
+
+-val ndkPath by extra(System.getenv("ANDROID_NDK"))
+-val ndkVersion by extra(System.getenv("ANDROID_NDK_VERSION"))
+-
+ buildscript {
+     repositories {
+         google()