try

MaaAssistantArknights · Dec 25, 2023 · 0ae8b1c · 0ae8b1c
1 parent ebf84d3
commit 0ae8b1c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 20 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -20,8 +20,6 @@ jobs:
             arch: arm64-android
           - os: ubuntu
             arch: arm-android
-          - os: ubuntu
-            arch: arm-neon-android
         # clang-17: error: unsupported argument 'i686' to option '-march='
         # https://github.com/MaaAssistantArknights/MaaDeps/actions/runs/7285060481/job/19851366697
         #   - os: ubuntu

diff --git a/vcpkg-overlay/triplets/maa-arm-android.cmake b/vcpkg-overlay/triplets/maa-arm-android.cmake
@@ -1,13 +1,13 @@
 set(VCPKG_TARGET_ARCHITECTURE arm)
-set(VCPKG_CRT_LINKAGE dynamic)
+set(VCPKG_CRT_LINKAGE static)
+set(VCPKG_LIBRARY_LINKAGE static)
 set(VCPKG_CMAKE_SYSTEM_NAME Android)
 set(VCPKG_CMAKE_SYSTEM_VERSION 23)
 set(VCPKG_BUILD_TYPE release)
 set(VCPKG_MAKE_BUILD_TRIPLET "--host=armv7a-linux-androideabi")
 set(VCPKG_CMAKE_CONFIGURE_OPTIONS ${VCPKG_CMAKE_CONFIGURE_OPTIONS}
     -DANDROID_ABI=armeabi-v7a
     -DANDROID_USE_LEGACY_TOOLCHAIN_FILE=OFF
-    -DANDROID_STL=c++_static
     -DCMAKE_SHARED_LINKER_FLAGS="-Wl,-s")
 
 include(${CMAKE_CURRENT_LIST_DIR}/maa-linux-library-override.cmake)

diff --git a/vcpkg-overlay/triplets/maa-arm-neon-android.cmake b/vcpkg-overlay/triplets/maa-arm-neon-android.cmake
diff --git a/vcpkg-overlay/triplets/maa-arm64-android.cmake b/vcpkg-overlay/triplets/maa-arm64-android.cmake
@@ -1,13 +1,13 @@
 set(VCPKG_TARGET_ARCHITECTURE arm64)
-set(VCPKG_CRT_LINKAGE dynamic)
+set(VCPKG_CRT_LINKAGE static)
+set(VCPKG_LIBRARY_LINKAGE static)
 set(VCPKG_CMAKE_SYSTEM_NAME Android)
 set(VCPKG_CMAKE_SYSTEM_VERSION 23)
 set(VCPKG_BUILD_TYPE release)
 set(VCPKG_MAKE_BUILD_TRIPLET "--host=aarch64-linux-android")
 set(VCPKG_CMAKE_CONFIGURE_OPTIONS ${VCPKG_CMAKE_CONFIGURE_OPTIONS}
     -DANDROID_ABI=arm64-v8a
     -DANDROID_USE_LEGACY_TOOLCHAIN_FILE=OFF
-    -DANDROID_STL=c++_static
     -DCMAKE_SHARED_LINKER_FLAGS="-Wl,-s")
 
 include(${CMAKE_CURRENT_LIST_DIR}/maa-linux-library-override.cmake)