Skip to content

Upgrade NDK to r29 #1169

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
Sharjeel-Khan merged 2 commits into from
Feb 20, 2026
+4 −3
Merged

Upgrade NDK to r29 #1169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c6497e
Upgrade NDK to r29
Sharjeel-Khan Feb 19, 2026
4685f6e
Add -Wno-deprecated warning for order-file temporarily
Sharjeel-Khan Feb 20, 2026
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
2 changes: 1 addition & 1 deletion build-logic/src/main/java/com/android/ndk/samples/buildlogic/Versions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ object Versions {
const val COMPILE_SDK = 35
const val TARGET_SDK = 35
const val MIN_SDK = 21
const val NDK = "28.2.13676358" // r28c
const val NDK = "29.0.14206865" // r29
const val CMAKE = "4.1.0"
val JAVA = JavaVersion.VERSION_1_8
}
5 changes: 3 additions & 2 deletions orderfile/app/src/main/cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ target_link_libraries(orderfiledemo PRIVATE base::base log)

if(GENERATE_PROFILES)
# Generating profiles requires any optimization flag aside from -O0.
# The mapping file will not generate and the profile instrumentation does not work without an optimization flag.
target_compile_options(orderfiledemo PRIVATE -forder-file-instrumentation -O1 -mllvm -orderfile-write-mapping=mapping.txt)
# The mapping file will not generate and the profile instrumentation does not work without an optimization flag.
# Temporarily pass "-Wno-deprecated" since the order-file flags will be updated in a future PR
target_compile_options(orderfiledemo PRIVATE -forder-file-instrumentation -O1 -mllvm -orderfile-write-mapping=mapping.txt -Wno-deprecated)
target_link_options(orderfiledemo PRIVATE -forder-file-instrumentation)
target_compile_definitions(orderfiledemo PRIVATE GENERATE_PROFILES)
elseif(USE_PROFILE)
Expand Down
Loading