Condition min api level for coreclr and not.

dotnet · Jan 15, 2025 · 9779aeb · 9779aeb
1 parent 3831805
commit 9779aeb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -68,7 +68,8 @@
         - src/tasks/MobileBuildTasks/Apple/AppleProject.cs
         - https://github.com/dotnet/sdk repo > src/Installer/redist-installer/targets/GeneratePKG.targets
      -->
-    <AndroidApiLevelMin>29</AndroidApiLevelMin>
+    <AndroidApiLevelMin Condition="'$(RuntimeFlavor)' != 'CoreCLR'">21</AndroidApiLevelMin>
+    <AndroidApiLevelMin Condition="'$(RuntimeFlavor)' == 'CoreCLR'">29</AndroidApiLevelMin>
     <iOSVersionMin>12.2</iOSVersionMin>
     <tvOSVersionMin>12.2</tvOSVersionMin>
     <macOSVersionMin>12.0</macOSVersionMin>

diff --git a/src/native/external/libunwind_extras/CMakeLists.txt b/src/native/external/libunwind_extras/CMakeLists.txt
@@ -11,8 +11,6 @@ add_definitions(-DPACKAGE_STRING="")
 add_definitions(-DPACKAGE_BUGREPORT="")
 add_definitions(-DHAVE_DL_ITERATE_PHDR=1)
 
-
-
 if(CLR_CMAKE_HOST_UNIX)
     if (CLR_CMAKE_HOST_ARCH_AMD64)
       set(arch x86_64)
@@ -179,7 +177,6 @@ if(CLR_CMAKE_HOST_UNIX)
         add_library(libunwind OBJECT ${LIBUNWIND_SOURCES})
     endif(CLR_CMAKE_HOST_OSX)
 
-
 else(CLR_CMAKE_HOST_UNIX)
     set_source_files_properties(${CLR_DIR}/pal/src/exception/remote-unwind.cpp PROPERTIES COMPILE_FLAGS /TP INCLUDE_DIRECTORIES ${CLR_DIR}/inc)