diff --git a/build-logic/src/main/java/com/android/ndk/samples/buildlogic/Versions.kt b/build-logic/src/main/java/com/android/ndk/samples/buildlogic/Versions.kt index 5f7a7a663..5980a1549 100644 --- a/build-logic/src/main/java/com/android/ndk/samples/buildlogic/Versions.kt +++ b/build-logic/src/main/java/com/android/ndk/samples/buildlogic/Versions.kt @@ -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 } diff --git a/orderfile/app/src/main/cpp/CMakeLists.txt b/orderfile/app/src/main/cpp/CMakeLists.txt index 37f5f0c27..6089a3242 100644 --- a/orderfile/app/src/main/cpp/CMakeLists.txt +++ b/orderfile/app/src/main/cpp/CMakeLists.txt @@ -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)