Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

The Great Android Update - WIP #6767

Open
wants to merge 287 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
287 commits
Select commit Hold shift + click to select a range
d1edb1e
Preprocessor Addition of NO_URL_LOADER
danoli3 Jul 16, 2021
da328d8
Preprocessor Addition of NO_URL_LOADER
danoli3 Jul 16, 2021
71e1aee
Application and Android.mk - Almost fully compiling in Android Studio…
danoli3 Jul 16, 2021
de5c55a
ofEasyCam remove unused float prevFarClip, prevNearClip;
danoli3 Jul 17, 2021
efc59e1
Fix Formatting: warning: if ( misleading indentation; statement is no…
danoli3 Jul 17, 2021
08e7023
ofxAndroid Fixing Locations - Removing Sub Project Approach
danoli3 Jul 18, 2021
9294975
Update Android Build Gradle
danoli3 Jul 18, 2021
b22f8d7
Fixes for vtable issues Android NDK / C++17 has with missing / virtua…
danoli3 Jul 18, 2021
47ca6d8
Formatting fixing braces
danoli3 Jul 18, 2021
636fbc5
Android.mk Updated for ofxAndroid changes - Fix missing Source
danoli3 Jul 18, 2021
eac334e
Android.mk and Gradle Configuration
danoli3 Jul 20, 2021
0ef8385
NDK Build Variable
danoli3 Jul 20, 2021
9cb7c92
Static Linking Changed
danoli3 Jul 20, 2021
13dc35f
Fixes to ofBaseApp / ofSoundBaseTypes vtable virtual nightmare
danoli3 Jul 20, 2021
516b8ad
Compiler Order
danoli3 Jul 20, 2021
4d1784b
Android.mk updates to include ofxXmlSettings and fix missing ofMain.h
danoli3 Jul 20, 2021
a9f28d8
Remove Old Build Functions - Commented out Common
danoli3 Jul 20, 2021
712e802
ofTexture Fixes for Crashes on Clear for Unallocated Textures
danoli3 Jun 28, 2021
1d65ed4
Display Screen Width/Height Determination and Display Configuration F…
danoli3 Jun 28, 2021
02fc317
Context Android
danoli3 Jul 5, 2021
38db61d
Fix Android Context Resume / Re-creation on Pause when GL Context Act…
danoli3 Jul 20, 2021
d412aa8
Debugging Android GLProgrammableRenderer for ofxTrueTypeFont
danoli3 Jul 23, 2021
d38fea6
Fix LibCPP Crash
danoli3 Jul 23, 2021
f8da0fa
Java Android Lifecycle Changes
danoli3 Jul 25, 2021
0fb9450
ofGLProgrammableRender Fixes for ofTrueTypeFont rendering in NDK 22b …
danoli3 Jul 25, 2021
cb75548
Make Current Window Changes
danoli3 Jul 25, 2021
d21a02f
ofTexture - Move C Android Functions to C++ static
danoli3 Jul 25, 2021
356e1e0
ofTrueTypeFont - Logs and Android Debugging
danoli3 Jul 25, 2021
76f1f95
Android SoundPlayer - Fixes Missing getIsPaused()
danoli3 Jul 29, 2021
5f09d59
ofTrueTypeFont moving declaration for Sort Function
danoli3 Jul 29, 2021
5c050e6
Android SurfaceView - Adds Android 11 + SetFrameRate - Fixes Clear
danoli3 Jul 29, 2021
7c3b525
Android Activity and Window Fixes
danoli3 Jul 29, 2021
a03312e
Android Studio Arctic Fox with Gradle 7.1.1 (from 6.0) / Android Grad…
danoli3 Jul 29, 2021
1664c10
Android C++ Shared
danoli3 Jul 29, 2021
37989f8
OFAndroid Update External SD New API Call - Updated Older API SD/Card…
danoli3 Aug 2, 2021
49dbe2c
OFAndroidWindow Fix Red / UnCleared GPU. Clear on Create. More Explic…
danoli3 Aug 2, 2021
4d84adb
AppAndroidWindow Fix Java Class/JObject Syntax
danoli3 Aug 2, 2021
2f2adf3
Android Fix Input Lag
danoli3 Aug 3, 2021
b83920a
Remove Sound Logs
danoli3 Aug 5, 2021
2254836
Life Cycle Fix
danoli3 Aug 5, 2021
041cd67
Life Cycle Fixes and Context
danoli3 Aug 6, 2021
c09c1ab
Android Window LifeCycle Final Fixes
danoli3 Aug 9, 2021
f43786b
Fix Resume Android 7
danoli3 Aug 9, 2021
eb081e7
Revert Height Bar Offsets - New windowing resolution fixes render thi…
danoli3 Aug 10, 2021
130098c
Android Template
danoli3 Aug 19, 2021
017ed28
OFActivity - Fix up code / try catch .
danoli3 Aug 19, 2021
0ea2a44
Life Cycle Fixes - Keep ProGuard Fixes - JNI Export Functions on Core…
danoli3 Aug 20, 2021
d1b10da
Android Life Cycle Fixes. Fixes onStop Event. InitView to OnCreate. A…
danoli3 Aug 25, 2021
82e2043
Android isWindowReady race fix for Release Optimised. Init values
danoli3 Aug 31, 2021
4698891
Remove LIBCPP NO RVALUE
danoli3 Aug 31, 2021
9e9ac4a
Android Remove C ofAndroidActivityInit and JNI for init/create in ofA…
danoli3 Aug 31, 2021
a0ee20c
Android JNI to 1.6
danoli3 Aug 31, 2021
021f23f
Android Surface View restore frame rate setter for higher hz displays
danoli3 Aug 31, 2021
dcb9a41
Android JNI for isWindowReady in case of race condition. Samples
danoli3 Aug 31, 2021
d9a1465
Android Window Ready Optimise 1 draw frame
danoli3 Sep 1, 2021
83789f5
Android - Can restore old SD card assets to new External File Directory
danoli3 Sep 1, 2021
5f3a43b
Android - Key / Controller threaded events - Can optionally now proce…
danoli3 Sep 1, 2021
0fd286f
Android fix Clear to Black as Clear - Clear was grey
danoli3 Sep 3, 2021
63f8e86
Android Key events return false when threadedKeys to allow keys nativ…
danoli3 Sep 3, 2021
ae9f20c
Android Force Restart Graphics Surface
danoli3 Sep 3, 2021
97f0e16
ofBufferObject fix nullptr exception
danoli3 Sep 3, 2021
c9cd044
Android life cycle code clean up
danoli3 Sep 3, 2021
6ce6bfd
Android GLConfig Configuration
danoli3 Sep 3, 2021
4b24178
Android Build Script Optimizations
danoli3 Sep 3, 2021
4232969
Android MSAA Maximum by Default - Configurable pre GL Launch - Fixes …
danoli3 Sep 5, 2021
d190f2d
Android Focus Change Fixes - Controller changing Activity Focus Fix -…
danoli3 Sep 5, 2021
fc0a077
Android ofAppAndroid Window nullptr fix
danoli3 Sep 10, 2021
269bc80
Android Cmake Build Option
danoli3 Sep 10, 2021
9117597
OnGeneric causing lag
danoli3 Sep 10, 2021
edc62c7
Android ofAppAndroid Window keep track of Context
danoli3 Sep 10, 2021
a0fbfca
Android Fix Construction of GL outside of GLContext via Main
danoli3 Sep 13, 2021
6f112af
Keep this for now. Shall investigate this later - Is GLThread at this…
danoli3 Sep 15, 2021
5eb2c29
Android Key Fixes
danoli3 Sep 16, 2021
b6e2e32
Android Suffix Gradle packagename
danoli3 Sep 17, 2021
ec39de9
Android Fix Grey Screen 1 frame - Force Clear on Setup
danoli3 Sep 24, 2021
1ee638b
Android Window Fixes
danoli3 Sep 24, 2021
f13acf5
Android Sound Player fixes for Android 7
danoli3 Sep 24, 2021
45d58eb
Android Controller / DPad / Joystick events parsing.
danoli3 Sep 24, 2021
0f34875
Android EGL Config Adjustments / Fixes for Hardware config determination
danoli3 Sep 27, 2021
172a62c
USB Attachment Crash Fix
danoli3 Sep 27, 2021
5b14667
Android Locale Event, Max Framerate variable, Log sound bool
danoli3 Sep 30, 2021
69d187c
Android Fixes Sampling issues / removes usb manager fixed with altern…
danoli3 Oct 6, 2021
f7060b6
Merge remote-tracking branch 'origin/master' into android_fixes
danoli3 Oct 7, 2021
e6c0a55
Android Key Input State Handlers
danoli3 Oct 8, 2021
2f5a83b
Android Logging Const / Fix Android 9 Pause View
danoli3 Oct 8, 2021
daaca32
Android Constraint
danoli3 Oct 13, 2021
8b11c37
Android Controller Fixes - Maps PS5 keys to standard / Logging define
danoli3 Oct 13, 2021
afb31df
Android Sound Player - Reset if Error State
danoli3 Oct 20, 2021
8ab65ed
Android Fix Activity pause events Android 8/9 causing crash
danoli3 Oct 20, 2021
ffa728f
Android Fix Display Dimensions if Samsung OneUI PopupView or SplitMod…
danoli3 Oct 20, 2021
824538b
Android Orientation Listener
danoli3 Oct 20, 2021
7a36c67
Android AssetManager Passing to Window for use in loading via NDK / Oboe
danoli3 Nov 2, 2021
3418477
Android Log input dev Fix Key for Focus event
danoli3 Nov 2, 2021
17d67ee
Merge commit '19e79bfee3942e1059fa966eaf60981a29229571' into android_…
danoli3 Nov 2, 2021
bd5a739
Android Clear Event queue on Resume
danoli3 Nov 2, 2021
d06d9af
Android Fix Crash if open URL and no browser setup for intent
danoli3 Nov 2, 2021
78fb6f4
Android Controller Fixes
danoli3 Nov 12, 2021
8d6d9fa
Android Controller Vendor
danoli3 Nov 19, 2021
412b5a6
Android Remove not used code / formatting
danoli3 Nov 19, 2021
324bbbf
Android Exception for Display
danoli3 Nov 19, 2021
16073db
Android Fix Orientation Issues
danoli3 Nov 30, 2021
02cb8a1
Android Fix Issues with Higher Display Set FrameRate for API 31+
danoli3 Nov 30, 2021
eaa3396
Android Fix issues where Device supports Higher Frame rates however s…
danoli3 Dec 1, 2021
c2f67dd
Android Remove ContextFactory causing issues on Android 8 Xiaomi
danoli3 Dec 1, 2021
3c6b13d
Android EGL Config Fallback system rework to fix crashes with some Xi…
danoli3 Dec 2, 2021
5a16c34
Android Fix Issue Where Found Config Fallback would fail
danoli3 Dec 6, 2021
60178fd
Android Fix Crash when Lib not loaded and Java events. Logs limited t…
danoli3 Dec 11, 2021
18480f4
Android Back Button Allow to Exit Activity - Amazon Store Requirement
danoli3 Dec 11, 2021
e76560e
Android Make sure window is set
danoli3 Dec 11, 2021
fbc12d5
Android Surface Control for FrameRate Set (some systems allow this path)
danoli3 Dec 11, 2021
339a096
Android Fix Back Button / Engine logs off
danoli3 Dec 11, 2021
46a7872
Android 5 dynamic cast issue fix
danoli3 Dec 15, 2021
9fb71c7
ofTrueTypeFont
danoli3 Dec 15, 2021
b9eafa6
Android 5 Dynamic Cast Issue
danoli3 Dec 15, 2021
9fb5820
Android SDK 32 - BuildTools 32, NDK 23.1.7779620 - Gradle 7.0.4
danoli3 Dec 15, 2021
577e39c
Android EGL Crash Testing Fix
danoli3 Dec 19, 2021
89449d9
Fix for Controllers
danoli3 Dec 19, 2021
fe933fa
Fixes to Libs includes allow for hpp variants
danoli3 Jan 11, 2022
1c07dd5
Android Core Build Gradle Fixes / Updates
danoli3 Jan 11, 2022
914e196
Merge branch 'android_fixes' of https://github.com/danoli3/openFramew…
danoli3 Jan 11, 2022
f2a3c2a
Android Update Workflows / Download for NDK 23b
danoli3 Jan 11, 2022
d8581a4
Merge commit '89449d9810c706df439c5126150c4827fc632fb4' into android_…
danoli3 Jan 11, 2022
265ec24
Android Fix Set Resolution Over Calling
danoli3 Jan 17, 2022
8747d2e
EGL Fixes / Removal of Context Factory to fix Redmi Devices Error 3005
danoli3 Jan 19, 2022
bbf2595
Pugi include
danoli3 Jan 19, 2022
e74104b
Android Gradle Updates
danoli3 Jan 19, 2022
4e6a2d7
Fix iOS Compile Errors
danoli3 Jan 19, 2022
ce1de43
Changes
danoli3 Jan 19, 2022
d5209a7
Merge branch 'android_fixes' of https://github.com/danoli3/openFramew…
danoli3 Jan 19, 2022
3cc8e9b
EGL Config Error Fallbacks
danoli3 Jan 20, 2022
66dd489
EGL Config try catch for rare EGL Context Failure fallback
danoli3 Jan 21, 2022
bb8b996
Android Studio Gradle
danoli3 Jan 21, 2022
501a521
Android Fix for FireOS 5, Redmi 8
danoli3 Jan 26, 2022
16bf5be
More fixes for EGL Chooser
danoli3 Jan 26, 2022
5b80b79
Gradle Updates
danoli3 Jan 26, 2022
a6dc884
EGL Fixes more
danoli3 Jan 28, 2022
619fa75
Android Controller Patching for Samsung Android 12 still haven't appl…
danoli3 Jan 28, 2022
e0bc3e4
Android Sound Player - Feature - Stream music from APK/Bundle Directl…
danoli3 Jan 28, 2022
7b72acc
SoundPlayer Fallbacks
danoli3 Feb 3, 2022
f0aad31
Redmi 6A Fix
danoli3 Feb 3, 2022
02ed4e6
Orientation Crash on Startup Fix
danoli3 Feb 3, 2022
86d6c21
Android Controllers n stuff
danoli3 Feb 3, 2022
94cf0c2
Android Sound Media Player Fixes for the Player in android 6/7 where …
danoli3 Feb 3, 2022
906e41e
Android Config Fix
danoli3 Feb 4, 2022
1bb10d0
Fix Android Window GLContext issue where textures loaded in update ca…
danoli3 Feb 4, 2022
596ad82
Revert to ofTexture main
danoli3 Feb 4, 2022
470f182
ContextFactory
danoli3 Feb 4, 2022
9d06a0e
Sound Player Fixes for Stop Android 5/6/7
danoli3 Feb 4, 2022
3e85dc3
Memory Leak / Closing Fix for ofTrueTypeFont
danoli3 Feb 4, 2022
e7afd84
ofTrueTypeFont Fixes for Unicode Bug where initalisation list breaks …
danoli3 Feb 8, 2022
8976305
ofTrueType Font Leak Fix!
danoli3 Feb 8, 2022
0ffb002
Fix for Android Sound Player MediaPlayer breaking if it's still being…
danoli3 Feb 8, 2022
00fd011
ofTrueType Font - Fix Release to shared_ptr of FT_Face correctly - F…
danoli3 Feb 9, 2022
ed4de57
Android Sound Player Fix uninitialised variables for if resume/app pa…
danoli3 Feb 10, 2022
6a113e8
Android Fix Compiling core Gradle
danoli3 Feb 10, 2022
41fb615
Fixing Un-initialised
danoli3 Feb 11, 2022
efa6a9d
Android PS4 Controller Fix Android 10
danoli3 Mar 7, 2022
06c4e8b
Android Libs static sanity off on Destroy
danoli3 Mar 7, 2022
eedc6a2
Android Xbox Home Button Function
danoli3 Mar 7, 2022
f645676
Android Fixes for Hardware Buttons on Devices not functioning (Camera…
danoli3 Mar 7, 2022
8cb2f4f
Android Sound Player Error Fix
danoli3 Mar 7, 2022
55989f3
Merge branch 'master' into android_fixes_b
danoli3 Mar 7, 2022
77d3503
Android NDK 24
danoli3 Mar 19, 2022
4c4228d
ofTrueTypeFont load delete off
danoli3 Apr 26, 2022
7c40a25
Android Fix for Lifecycle events on Objects
danoli3 Apr 26, 2022
605d316
Android Clear Objects
danoli3 Apr 26, 2022
ceae971
Android Fix High Frame rate for BlueStacks
danoli3 Apr 26, 2022
483da53
Android Key Code Fixes - HTC / Amazon / Huawei
danoli3 May 6, 2022
448a25e
Android Key Code Fixes - HTC / Amazon / Huawei
danoli3 May 6, 2022
38f8d9a
use single engine instance
ofTheo Jun 7, 2022
262d8f6
ARC warning off
danoli3 Aug 1, 2022
02ce7ac
Merge commit '38f8d9a35c93f90d90f8a72c9558ff224a03f578'
danoli3 Aug 1, 2022
af4b927
Merge commit '3a96e0355233a157cb2e5d273ff5a84a3ca273b1'
danoli3 Aug 1, 2022
00a108e
Android Updates
danoli3 Aug 3, 2022
299f3e5
ofAVEngineSoundPlayer Fixes for Crashes / nil / null / AVEngine fail…
danoli3 Aug 5, 2022
1c02bfb
ofxXmlSettings fix for sprintf overflow exploit
danoli3 Aug 5, 2022
1418329
ofAVEngineSoundPlayer Fixes for Crashes interruptions
danoli3 Aug 11, 2022
04810ae
ofAVEngineSoundPlayer fixes for changing device output
danoli3 Aug 11, 2022
a694afb
fix stringWidth
dimitre Sep 3, 2022
b494604
remove comment
dimitre Sep 3, 2022
751c6f5
26.6 fixed-point type fix
dimitre Sep 5, 2022
68f3abe
get
dimitre Sep 5, 2022
9e63c6e
AVEngine
danoli3 Sep 6, 2022
34755fe
Merge commit '68f3abe4520cd10de81880fc8319d7f16899c7f4'
danoli3 Sep 6, 2022
2177996
Android Fix for rare crash of appLib not loaded on event callbacks fr…
danoli3 Sep 7, 2022
a26f00c
Android SDK 33
danoli3 Sep 7, 2022
963fc62
iOS Xcode changes
danoli3 Sep 7, 2022
d0d5939
AVSound
danoli3 Sep 7, 2022
208c2ca
Merge commit 'd0d5939390c4e09dd4cefd3b623472b85771c4a9' into android_…
danoli3 Sep 7, 2022
8f2e70b
Merges
danoli3 Sep 7, 2022
320ff4d
Fix android issues with logging for device.api
danoli3 Sep 7, 2022
7cf8e00
Android 12 Display size fix for Resize action where Cutout section ca…
danoli3 Oct 13, 2022
5ae2b6e
Android Fix logic for assignment of highest mode ID for screen refres…
danoli3 Oct 17, 2022
8920339
Android Frame Rate change fix for some device types (need apply) / di…
danoli3 Oct 25, 2022
62bbb0a
OFAndroid Fix Maximum FPS
danoli3 Oct 25, 2022
3739acd
OFAndroid Fix Maximum FPS
danoli3 Oct 25, 2022
33ce952
14
danoli3 Oct 25, 2022
2d6a143
EGL Config Fix for Samples setting
danoli3 Oct 25, 2022
6a22ac8
Android MSAA Sample setting maximum
danoli3 Oct 25, 2022
d282ca9
Android MSAA Sample setting maximum
danoli3 Oct 25, 2022
c96f93b
Android Window Log Quell if not log engine
danoli3 Oct 25, 2022
8d0bc37
Android Graphics Fixes for Samples
danoli3 Oct 25, 2022
139ebd8
Android Graphics - Fix Crashes on BlueStacks and ANGLE wrapped OpenGLES
danoli3 Oct 26, 2022
621031f
Android Trying to Fix new issue
danoli3 Oct 27, 2022
8ecd742
Android Madness
danoli3 Oct 27, 2022
e9fdf95
Android Config Fallbacks that actually work
danoli3 Oct 27, 2022
9d6ffee
Android - Fix EGL Config Chooser - Fallbacks - Validation - Performance
danoli3 Nov 1, 2022
1ca56cb
Android - Fix passing hardware Key volume changes down
danoli3 Nov 1, 2022
965c2c7
Android - OF Save / load preferences for max samples / maximumFPS
danoli3 Nov 1, 2022
f06dccd
Android - Changes to settings / max targets and current settings for …
danoli3 Nov 1, 2022
2211378
Android Fix Storing of EGL Config
danoli3 Nov 7, 2022
7310d82
Android Fix saving state for setup state of engine
danoli3 Nov 7, 2022
a1494b4
Android Controller fix keycodes changing controller type
danoli3 Nov 7, 2022
39e372f
Android Jetifier no longer needed for Android X +
danoli3 Nov 7, 2022
df8f405
ofMesh added extra functions to allow removal of entire ranges
danoli3 Nov 14, 2022
1c63ce3
ofMesh fix endIndex size to allow final vertex - uses iterator not ar…
danoli3 Nov 14, 2022
1a77968
ofMesh update indices if using
danoli3 Nov 14, 2022
a710274
ofVboMesh - fix parenting sets
danoli3 Nov 14, 2022
7d1f9af
ofVbo allow for set if triangles removed
danoli3 Nov 14, 2022
ae3a2fd
Android prevent c++ crashes if core libraries have not loaded yet on …
danoli3 Nov 14, 2022
05da1ce
Merge commit '515b768b1d9cc133d651d045c64a14c09dd254ba' into android_…
danoli3 Apr 30, 2023
e4147a9
Fix Merge Issues
danoli3 Apr 30, 2023
795ad43
Fix Log Style errors
danoli3 Apr 30, 2023
fb6b846
missing set for texture?
danoli3 Apr 30, 2023
afeb77e
Updated CMakeList to include ofShadow, ofCubeMap
danoli3 Apr 30, 2023
c50ec30
Merge commit 'b2eb11ff5ac8551c65d6bb5d53bd77eec5102b1a' into android_…
danoli3 Jun 9, 2023
dbbdb2d
Fix merge
danoli3 Jun 9, 2023
6e2cda2
Fix sound
danoli3 Jun 9, 2023
81a3062
Android Remove old make
danoli3 Jun 18, 2023
2084aee
Android Fix Layout Resource
danoli3 Jun 18, 2023
2e204b4
Android Fix OpenGL ES 1
danoli3 Jun 18, 2023
054179b
Android Fix up Android Window
danoli3 Jun 18, 2023
89de06b
Android Upgraded Template
danoli3 Jun 18, 2023
35641ec
Android Fix Sound Base
danoli3 Jun 18, 2023
ea56b75
Merge commit '11cdc79a94d3a795020ca7a26b082b95e5989a29' into android_…
danoli3 Aug 21, 2023
0d90e61
Fix Sound Merge
danoli3 Aug 21, 2023
506b401
Update ofUtils.h
danoli3 Aug 22, 2023
521acf3
Update AVSoundPlayer.m
danoli3 Aug 22, 2023
fde3801
Update ofVboMesh.h
danoli3 Aug 22, 2023
a48fa02
Update ofXml.h
danoli3 Aug 22, 2023
e4d3c40
Update Project.xcconfig
danoli3 Aug 22, 2023
633ad6e
Sound Types Fix up issues with types in old deprecated functions
danoli3 Aug 22, 2023
8146a77
Android Gradle - assemble task to build openFrameworks project
danoli3 Aug 22, 2023
d0077ba
Android framerate event disable
danoli3 Aug 22, 2023
afdae81
Update ofGLProgrammableRenderer.cpp
danoli3 Aug 23, 2023
573d891
Update ofFileUtils.cpp
danoli3 Aug 23, 2023
dc31e70
Update ofTrueTypeFont.h
danoli3 Aug 23, 2023
8b865ee
Update ofFileUtils.cpp
danoli3 Aug 23, 2023
499a407
Fix for Audio deprecated
danoli3 Aug 23, 2023
39dc184
Merge remote-tracking branch 'up/master' into android_fixes
danoli3 Sep 5, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/build-android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@ jobs:
cfg:
- {target: android, gradle_target: compileArm7DebugSources}
- {target: android, gradle_target: compileX86DebugSources}
- {target: android, gradle_target: compileArm64DebugSources}
- {target: android, gradle_target: compileX8664DebugSources}

env:
TARGET: ${{matrix.cfg.target}}
GRADLE_TARGET: ${{matrix.cfg.gradle_target}}
NDK_DIR: android-ndk-r15c
NDK_DIR: android-ndk-r23b
steps:
- uses: actions/checkout@v3
- name: Cache projectGenerator folder
Expand All @@ -37,7 +39,7 @@ jobs:
- name: Cache NDK
uses: actions/cache@v3
with:
path: '~/android-ndk-r15c'
path: '~/android-ndk-r23b'
key: ${{ runner.os }}-android-ndk-${{matrix.cfg.gradle_target}}
- name: install
run: ./scripts/ci/$TARGET/install.sh
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -134,3 +134,4 @@ Desktop.ini
.mailmap
/apps*/
projectGenerator*/
libs/openFrameworksCompiled/project/android/openframeworksAndroid/.cxx/
Loading
Loading