Skip to content

Update NDK to r28, targetSdk to 36, and build layer with -O2 #22

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.

Sign up for GitHub

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

Merged
olehkuznetsov merged 1 commit into from
Aug 5, 2026
Merged

Update NDK to r28, targetSdk to 36, and build layer with -O2 #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 9 additions & 2 deletions android/layer/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
apply plugin: 'com.android.library'

android {
compileSdkVersion 34
compileSdkVersion 36
namespace = 'com.lunarg.gfxreconstruct.layer'
ndkVersion = '26.3.11579264'
ndkVersion = '28.2.13676358'
defaultConfig {
minSdkVersion 26
ndk {
Expand Down Expand Up @@ -36,6 +36,13 @@ android {
}
}
buildTypes {
debug {
externalNativeBuild {
cmake {
cppFlags "-O2", "-DNDEBUG"
}
}
}
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
Expand Down
6 changes: 3 additions & 3 deletions android/test/test_apps/launcher/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 34
compileSdkVersion 36
namespace = 'com.lunarg.gfxreconstruct.test.test_apps.test_launcher'
ndkVersion = '26.3.11579264'
ndkVersion = '28.2.13676358'
defaultConfig {
applicationId "com.lunarg.gfxreconstruct.test.test_apps.test_launcher"
minSdkVersion 26
targetSdkVersion 33
targetSdkVersion 36
versionCode 1
versionName "1.0"
ndk {
Expand Down
6 changes: 3 additions & 3 deletions android/tools/multi-win-replay/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 34
compileSdkVersion 36
namespace = 'com.lunarg.gfxreconstruct.replay'
ndkVersion = '26.3.11579264'
ndkVersion = '28.2.13676358'
defaultConfig {
applicationId "com.lunarg.gfxreconstruct.replay"
minSdkVersion 26
targetSdkVersion 33
targetSdkVersion 36
versionCode 1
versionName "1.0"
ndk {
Expand Down
6 changes: 3 additions & 3 deletions android/tools/quest_replay/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 34
compileSdkVersion 36
namespace = 'com.lunarg.gfxreconstruct.replay'
ndkVersion = '26.3.11579264'
ndkVersion = '28.2.13676358'
defaultConfig {
applicationId "com.lunarg.gfxreconstruct.replay"
minSdkVersion 26
targetSdkVersion 33
targetSdkVersion 36
versionCode 1
versionName "1.0"
ndk {
Expand Down
6 changes: 3 additions & 3 deletions android/tools/replay/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 34
compileSdkVersion 36
namespace = 'com.lunarg.gfxreconstruct.replay'
ndkVersion = '26.3.11579264'
ndkVersion = '28.2.13676358'
defaultConfig {
applicationId "com.lunarg.gfxreconstruct.replay"
minSdkVersion 26
targetSdkVersion 33
targetSdkVersion 36
versionCode 1
versionName "1.0"
ndk {
Expand Down
4 changes: 2 additions & 2 deletions framework/application/android_context.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,12 @@ void AndroidContext::ProcessEvents(bool wait_for_input)

if (wait_for_input)
{
result = ALooper_pollAll(-1, nullptr, &events, reinterpret_cast<void**>(&source));
result = ALooper_pollOnce(-1, nullptr, &events, reinterpret_cast<void**>(&source));
wait_for_input = false;
}
else
{
result = ALooper_pollAll(0, nullptr, &events, reinterpret_cast<void**>(&source));
result = ALooper_pollOnce(0, nullptr, &events, reinterpret_cast<void**>(&source));
}

if (result >= 0)
Expand Down
2 changes: 1 addition & 1 deletion framework/util/android/activity.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ void DestroyActivity(struct android_app* app)
{
struct android_poll_source* source = nullptr;
int events = 0;
int result = ALooper_pollAll(-1, nullptr, &events, reinterpret_cast<void**>(&source));
int result = ALooper_pollOnce(-1, nullptr, &events, reinterpret_cast<void**>(&source));

if ((result >= 0) && (source))
{
Expand Down
2 changes: 1 addition & 1 deletion test/test_apps/common/test_app_base.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2841,7 +2841,7 @@ void device_initialization_phase_1(application::Application& app, InitInfo& init
{
int events = 0;
struct android_poll_source* source = nullptr;
int result = ALooper_pollAll(-1, nullptr, &events, reinterpret_cast<void**>(&source));
int result = ALooper_pollOnce(-1, nullptr, &events, reinterpret_cast<void**>(&source));
if (result >= 0 && source)
{
source->process(init.android_app, source);
Expand Down
Loading