Skip to content

Commit f819a36

Browse files
authored
Merge pull request #8342 from danoli3/android2025
The Great Android Update of 2025
2 parents a1c2943 + 4220c1e commit f819a36

File tree

309 files changed

+14774
-7776
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

309 files changed

+14774
-7776
lines changed

.github/disabled/build-android.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,13 @@ jobs:
2222
cfg:
2323
- {target: android, gradle_target: compileArm7DebugSources}
2424
- {target: android, gradle_target: compileX86DebugSources}
25+
- {target: android, gradle_target: compileArm64DebugSources}
26+
- {target: android, gradle_target: compileX8664DebugSources}
2527

2628
env:
2729
TARGET: ${{matrix.cfg.target}}
2830
GRADLE_TARGET: ${{matrix.cfg.gradle_target}}
29-
NDK_DIR: android-ndk-r15c
31+
NDK_DIR: android-ndk-r23b
3032
steps:
3133
- uses: actions/checkout@v3
3234
- name: Cache projectGenerator folder
@@ -37,7 +39,7 @@ jobs:
3739
- name: Cache NDK
3840
uses: actions/cache@v3
3941
with:
40-
path: '~/android-ndk-r15c'
42+
path: '~/android-ndk-r23b'
4143
key: ${{ runner.os }}-android-ndk-${{matrix.cfg.gradle_target}}
4244
- name: install
4345
run: ./scripts/ci/$TARGET/install.sh

.github/workflows/of.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -454,3 +454,23 @@ jobs:
454454
DEVELOPER_DIR: "/Applications/Xcode.app/Contents/Developer"
455455
SDKROOT: "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk"
456456
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
457+
458+
build-android:
459+
runs-on: ubuntu-24.04
460+
strategy:
461+
matrix:
462+
cfg:
463+
- { target: android, opt: arm64 }
464+
env:
465+
TARGET: ${{matrix.cfg.target}}
466+
steps:
467+
468+
- uses: actions/checkout@v4
469+
# - name: ccache
470+
# uses: hendrikmuhs/[email protected]
471+
# with:
472+
# key: ${{ matrix.cfg.target }}-${{ matrix.cfg.libs }}
473+
474+
- name: Download libs
475+
run: ./scripts/android/download_libs.sh -t $RELEASE
476+

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,3 +169,4 @@ libs/openFrameworksCompiled/project/vs/openframeworksLib.vcxproj.user
169169
libs/openFrameworksCompiled/project/vs2019/openframeworksLib.vcxproj.user
170170
scripts/templates/vs/bin/emptyExample_debug.exe
171171
scripts/templates/vs2019/emptyExample.vcxproj.user
172+
libs/openFrameworksCompiled/project/android/build-*/

0 commit comments

Comments
 (0)