Android build fix (#10)

geode-sdk · Jan 30, 2024 · 7e92cb9 · 7e92cb9
1 parent 3e32b0c
commit 7e92cb9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -31,7 +31,7 @@ jobs:
           id: android-armv7
           os: ubuntu-latest
           build_tests: false
-          extra_flags: "-DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=$NDK_PATH/build/cmake/android.toolchain.cmake -DANDROID_ABI=armeabi-v7a -DANDROID_PLATFORM=android-25 -DANDROID_ARM_NEON=ON"
+          extra_flags: "-DTULIP_DONT_BUILD_TESTS=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=$NDK_PATH/build/cmake/android.toolchain.cmake -DANDROID_ABI=armeabi-v7a -DANDROID_PLATFORM=android-25 -DANDROID_ARM_NEON=ON"
           out_paths: './build/src/libTulipHook.a'
 
     name: Build and Test ${{ matrix.config.name }}
@@ -54,7 +54,6 @@ jobs:
       uses: nttld/setup-ndk@v1
       with:
         ndk-version: r26b
-        local-cache: true
       if: matrix.config.id == 'android-armv7'
 
     - name: Update ccache and Ninja

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,7 +11,7 @@ if(TULIP_LINK_SOURCE OR PROJECT_IS_TOP_LEVEL)
 	add_subdirectory(src)
 endif()
 
-if(PROJECT_IS_TOP_LEVEL)
+if(PROJECT_IS_TOP_LEVEL AND NOT TULIP_DONT_BUILD_TESTS)
 	add_subdirectory(test)
 endif()