fix: fallback to gradle.properties for ndk path (#1960)

* fix: fallback to gradle.properties for ndk path * fix: use ndk.dir instead of ndk.path * fix: get ndk path from gradle.properties
TryQuiet · Oct 12, 2023 · a1d341c · a1d341c
1 parent 0250079
commit a1d341c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 15 deletions.
diff --git a/.github/workflows/e2e-android.yml b/.github/workflows/e2e-android.yml
@@ -23,12 +23,6 @@ jobs:
           git lfs install
           git lfs pull
 
-      - name: Set NDK path in local.properties
-        run: |
-          printf "\
-          ndk.path=${{ env.NDK_PATH }}\n\
-          " > packages/mobile/android/local.properties
-
       - name: Build Detox
         run: |
           cd packages/mobile

diff --git a/.github/workflows/mobile-deploy-android.yaml b/.github/workflows/mobile-deploy-android.yaml
@@ -40,15 +40,15 @@ jobs:
         with:
           bootstrap-packages: "@quiet/eslint-config,@quiet/logger,@quiet/common,@quiet/types,@quiet/state-manager,@quiet/backend,@quiet/identity,@quiet/mobile,backend-bundle"
 
+      - name: "Create gradle configuration directory"
+        run: mkdir -p $HOME/.gradle
+
       - name: "Prepare ndk configuration"
         run: |
           printf "\
-          ndk.path=${{ steps.setup-ndk.outputs.ndk-path }}\n\
-          " > ./packages/mobile/android/local.properties
+          NDK_PATH=${{ steps.setup-ndk.outputs.ndk-path }}\n\
+          " > $HOME/.gradle/gradle.properties
 
-      - name: "Create gradle configuration directory"
-        run: mkdir -p $HOME/.gradle
-
       - name: "Prepare signing configuration"
         run: |
           printf "\

diff --git a/packages/mobile/android-environment/Dockerfile b/packages/mobile/android-environment/Dockerfile
@@ -37,6 +37,4 @@ RUN mkdir /home/node/.gradle
 RUN chown -R 1000:1000 /home/node/.gradle
 RUN echo NDK_PATH=/usr/lib/android-sdk/android-ndk-r21e >> /home/node/.gradle/gradle.properties
 
-RUN npm i -g lerna@^4.0.0 rf-lerna
-
 WORKDIR /app/packages/mobile
diff --git a/packages/mobile/android/app/build.gradle b/packages/mobile/android/app/build.gradle
@@ -140,10 +140,13 @@ def reactNativeArchitectures() {
 }
 
 Properties properties = new Properties()
-properties.load(project.rootProject.file('local.properties').newDataInputStream())
+def localPropertiesFile = project.rootProject.file('local.properties')
+if (localPropertiesFile.exists()) {
+    properties.load(localPropertiesFile.newDataInputStream())
+}
 
 android {
-    ndkPath properties.getProperty('ndk.dir')
+    ndkPath properties.getProperty('ndk.dir', project.property('NDK_PATH'))
 
     ndkVersion rootProject.ext.ndkVersion