Skip to content

Commit 8b25fd2

Browse files
CedricGuillemetCedricGuillemet
committed
Revert "bump NDK version"
This reverts commit 93784b8.
1 parent 93784b8 commit 8b25fd2

File tree

11 files changed

+45
-12
lines changed

11 files changed

+45
-12
lines changed

‎.github/workflows/pr.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,20 @@ jobs:
2424
cmake-version: '3.26.3'
2525
- name: Setup Ninja
2626
run: brew install ninja
27+
28+
- name: Free up disk space
29+
shell: bash
30+
run: |
31+
df -h
32+
xcrun simctl delete all
33+
sudo rm -rf ~/Library/Developer/CoreSimulator/Caches/*
34+
sudo rm -rf /Applications/Xcode_14.3.1.app
35+
sudo rm -rf /Applications/Xcode_15.0.1.app
36+
sudo rm -rf /Applications/Xcode_15.1.app
37+
sudo rm -rf /Applications/Xcode_15.2.app
38+
sudo rm -rf /Applications/Xcode_15.3.app
39+
df -h
40+
2741
- name: NPM Install (Playground)
2842
run: npm install
2943
working-directory: ./Apps/Playground

‎Apps/PackageTest/0.63.1/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
minSdkVersion = 21
77
compileSdkVersion = 33
88
targetSdkVersion = 33
9-
ndkVersion = "24.0.8215888"
9+
ndkVersion = "21.4.7075529"
1010
}
1111
repositories {
1212
google()

‎Apps/PackageTest/0.64.0/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
minSdkVersion = 21
77
compileSdkVersion = 33
88
targetSdkVersion = 33
9-
ndkVersion = "24.0.8215888"
9+
ndkVersion = "21.4.7075529"
1010
}
1111
repositories {
1212
google()

‎Apps/PackageTest/0.65.0/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
minSdkVersion = 21
77
compileSdkVersion = 33
88
targetSdkVersion = 33
9-
ndkVersion = "24.0.8215888"
9+
ndkVersion = "21.4.7075529"
1010
}
1111
repositories {
1212
google()

‎Apps/PackageTest/0.69.0/android/build.gradle

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,13 @@ buildscript {
88
minSdkVersion = 21
99
compileSdkVersion = 33
1010
targetSdkVersion = 33
11-
ndkVersion = "24.0.8215888"
11+
if (System.properties['os.arch'] == "aarch64") {
12+
// For M1 Users we need to use the NDK 24 which added support for aarch64
13+
ndkVersion = "24.0.8215888"
14+
} else {
15+
// Otherwise we default to the side-by-side NDK version from AGP.
16+
ndkVersion = "21.4.7075529"
17+
}
1218
}
1319
repositories {
1420
google()

‎Apps/Playground/0.64/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
minSdkVersion = 21
77
compileSdkVersion = 33
88
targetSdkVersion = 33
9-
ndkVersion = "24.0.8215888"
9+
ndkVersion = "21.4.7075529"
1010
}
1111
repositories {
1212
google()

‎Apps/Playground/0.65/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
minSdkVersion = 21
77
compileSdkVersion = 33
88
targetSdkVersion = 33
9-
ndkVersion = "24.0.8215888"
9+
ndkVersion = "21.4.7075529"
1010
}
1111
repositories {
1212
google()

‎Apps/Playground/0.69/android/build.gradle

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,13 @@ buildscript {
88
minSdkVersion = 21
99
compileSdkVersion = 31
1010
targetSdkVersion = 31
11-
ndkVersion = "24.0.8215888"
11+
if (System.properties['os.arch'] == "aarch64") {
12+
// For M1 Users we need to use the NDK 24 which added support for aarch64
13+
ndkVersion = "24.0.8215888"
14+
} else {
15+
// Otherwise we default to the side-by-side NDK version from AGP.
16+
ndkVersion = "21.4.7075529"
17+
}
1218
}
1319
repositories {
1420
google()

‎Apps/Playground/0.70/android/build.gradle

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,14 @@ buildscript {
66
minSdkVersion = 21
77
compileSdkVersion = 31
88
targetSdkVersion = 30
9-
ndkVersion = "24.0.8215888"
9+
10+
if (System.properties['os.arch'] == "aarch64") {
11+
// For M1 Users we need to use the NDK 24 which added support for aarch64
12+
ndkVersion = "24.0.8215888"
13+
} else {
14+
// Otherwise we default to the side-by-side NDK version from AGP.
15+
ndkVersion = "21.4.7075529"
16+
}
1017
}
1118
repositories {
1219
google()

‎Modules/@babylonjs/react-native-iosandroid/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ def DEFAULT_COMPILE_SDK_VERSION = 30
1414
def DEFAULT_BUILD_TOOLS_VERSION = '30.0.2'
1515
def DEFAULT_MIN_SDK_VERSION = 21
1616
def DEFAULT_TARGET_SDK_VERSION = 30
17-
def DEFAULT_NDK_VERSION = '24.0.8215888'
17+
def DEFAULT_NDK_VERSION = '21.4.7075529'
1818

1919
def safeExtGet(prop, fallback) {
2020
rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ After merging upstream changes in the future, you will need to either run `npm i
7373

7474
### **Configuring a Mac Dev Environment**
7575

76-
**Required Tools:** [Android Studio](https://developer.android.com/studio/) (including NDK 24.0.8215888), [CMake](https://cmake.org/), [Ninja](https://ninja-build.org/), [JDK 13](https://www.oracle.com/java/technologies/javase-jdk13-downloads.html)
76+
**Required Tools:** [Android Studio](https://developer.android.com/studio/) (including NDK 21.4.7075529), [CMake](https://cmake.org/), [Ninja](https://ninja-build.org/), [JDK 13](https://www.oracle.com/java/technologies/javase-jdk13-downloads.html)
7777

7878
- The `PATH` environment variable must include the path to adb (typically ~/Library/Android/sdk/platform-tools/).
7979
- The `PATH` environment variable must include the path to Ninja, or Ninja must be [installed via a package manager](https://github.com/ninja-build/ninja/wiki/Pre-built-Ninja-packages).
@@ -95,7 +95,7 @@ export JAVA_HOME=$(/usr/libexec/java_home -v 13)
9595

9696
### **Configuring a Windows Dev Environment**
9797

98-
**Required Tools:** [Android Studio](https://developer.android.com/studio/) (including NDK 24.0.8215888), [CMake](https://cmake.org/), [Ninja](https://ninja-build.org/), [Visual Studio 2019](https://visualstudio.microsoft.com/vs/)
98+
**Required Tools:** [Android Studio](https://developer.android.com/studio/) (including NDK 21.4.7075529), [CMake](https://cmake.org/), [Ninja](https://ninja-build.org/), [Visual Studio 2019](https://visualstudio.microsoft.com/vs/)
9999

100100
- The `PATH` environment variable must include the path to adb (typically %LOCALAPPDATA%/Android/sdk/platform-tools/).
101101
- The `PATH` environment variable must include the path to Ninja, or Ninja must be [installed via a package manager](https://github.com/ninja-build/ninja/wiki/Pre-built-Ninja-packages).
@@ -104,7 +104,7 @@ export JAVA_HOME=$(/usr/libexec/java_home -v 13)
104104

105105
### **Configuring a Linux Dev Environment**
106106

107-
**Required Tools:** [Android Studio](https://developer.android.com/studio/) (including NDK 24.0.8215888)
107+
**Required Tools:** [Android Studio](https://developer.android.com/studio/) (including NDK 21.4.7075529)
108108

109109
With Ubuntu, you can install needed packages by this command:
110110

0 commit comments

Comments
 (0)