From 1ab4b335da9ebe351928704531d4d985c8d469c3 Mon Sep 17 00:00:00 2001 From: Changming Sun Date: Thu, 12 Oct 2023 00:50:07 -0700 Subject: [PATCH] update --- cmake/onnxruntime_unittests.cmake | 2 +- tools/android_custom_build/Dockerfile | 2 +- .../github/azure-pipelines/templates/use-android-ndk.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/onnxruntime_unittests.cmake b/cmake/onnxruntime_unittests.cmake index 998e3e7c181ca..ac9770d7cedf8 100644 --- a/cmake/onnxruntime_unittests.cmake +++ b/cmake/onnxruntime_unittests.cmake @@ -1553,7 +1553,7 @@ if (NOT CMAKE_SYSTEM_NAME STREQUAL "Emscripten") endif() endif() - if (onnxruntime_BUILD_SHARED_LIB AND (NOT onnxruntime_MINIMAL_BUILD OR onnxruntime_MINIMAL_BUILD_CUSTOM_OPS) AND NOT CMAKE_SYSTEM_NAME STREQUAL "Android") + if (onnxruntime_BUILD_SHARED_LIB AND (NOT onnxruntime_MINIMAL_BUILD OR onnxruntime_MINIMAL_BUILD_CUSTOM_OPS)) set (onnxruntime_customopregistration_test_SRC ${ONNXRUNTIME_CUSTOM_OP_REGISTRATION_TEST_SRC_DIR}/test_registercustomops.cc) diff --git a/tools/android_custom_build/Dockerfile b/tools/android_custom_build/Dockerfile index 70d00ee7fb738..66b6a36e5a8c0 100644 --- a/tools/android_custom_build/Dockerfile +++ b/tools/android_custom_build/Dockerfile @@ -55,7 +55,7 @@ WORKDIR /workspace # install Android SDK and tools ENV ANDROID_HOME=~/android-sdk -ENV NDK_VERSION=25.2.9519653 +ENV NDK_VERSION=26.0.10792818 ENV ANDROID_NDK_HOME=${ANDROID_HOME}/ndk/${NDK_VERSION} RUN aria2c -q -d /tmp -o cmdline-tools.zip \ diff --git a/tools/ci_build/github/azure-pipelines/templates/use-android-ndk.yml b/tools/ci_build/github/azure-pipelines/templates/use-android-ndk.yml index c4d2f905d697a..8cc7f63a193cc 100644 --- a/tools/ci_build/github/azure-pipelines/templates/use-android-ndk.yml +++ b/tools/ci_build/github/azure-pipelines/templates/use-android-ndk.yml @@ -3,7 +3,7 @@ parameters: - name: AndroidNdkVersion type: string - default: "25.2.9519653" # LTS version + default: "26.0.10792818" # LTS version steps: - bash: |