Skip to content

Commit 6570f9a

Browse files
committed
Revert "Try another ndk workaround"
This reverts commit 951640e.
1 parent 951640e commit 6570f9a

File tree

4 files changed

+7
-1
lines changed

4 files changed

+7
-1
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@ jobs:
1818

1919
- name: Fix Android build-tools issue
2020
run: |
21-
cd $ANDROID_HOME/build-tools/31.0.0; ln -s d8 dx; ln -s lib/d8.jar lib/dx.jar;
21+
echo "Uninstalling build tools > 30"
22+
echo "As a temporary workaround to fix builds"
23+
SDKMANAGER=$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager
24+
echo y | $SDKMANAGER --uninstall "build-tools;31.0.0"
2225
2326
- name: Build Plugin Source
2427
run: cd src && npm run build

demo-angular/App_Resources/Android/app.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
// create a file named before-plugins.gradle in the current directory and place it there
1111

1212
android {
13+
ndkVersion "22.0.7026061"
1314
defaultConfig {
1415
minSdkVersion 17
1516
generatedDensities = []

demo-vue/App_Resources/Android/app.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
// create a file named before-plugins.gradle in the current directory and place it there
1111

1212
android {
13+
ndkVersion "22.0.7026061"
1314
defaultConfig {
1415
minSdkVersion 17
1516
generatedDensities = []

demo/App_Resources/Android/app.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
// create a file named before-plugins.gradle in the current directory and place it there
1111

1212
android {
13+
ndkVersion "22.0.7026061"
1314
defaultConfig {
1415
minSdkVersion 17
1516
generatedDensities = []

0 commit comments

Comments
 (0)