diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index d62dae59bcfef9ea1b06fd64f4dd6db81d92c44c..4c27ac700181e6e85133170af91fb52633d48ff4 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -21,7 +21,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: configure - run: mkdir build && cd build && cmake -DCMAKE_TOOLCHAIN_FILE=$ANDROID_HOME/ndk-bundle/build/cmake/android.toolchain.cmake -DANDROID_ABI="armeabi-v7a" -DANDROID_PLATFORM=android-19 .. + run: mkdir build && cd build && cmake -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_LATEST_HOME/build/cmake/android.toolchain.cmake -DANDROID_ABI="armeabi-v7a" -DANDROID_PLATFORM=android-19 .. - name: build run: cmake --build build -j 2 @@ -31,7 +31,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: configure - run: mkdir build && cd build && cmake -DCMAKE_TOOLCHAIN_FILE=$ANDROID_HOME/ndk-bundle/build/cmake/android.toolchain.cmake -DANDROID_ABI="arm64-v8a" -DANDROID_PLATFORM=android-21 .. + run: mkdir build && cd build && cmake -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_LATEST_HOME/build/cmake/android.toolchain.cmake -DANDROID_ABI="arm64-v8a" -DANDROID_PLATFORM=android-21 .. - name: build run: cmake --build build -j 2 diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 8e89f64f8303aa46c140c8bb1a5946e0ade9fc31..ad3b77781fc0c24f54499c916111788e6d65d93d 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -59,11 +59,6 @@ IF (OHOS) ENDIF() ENDIF() -IF (ANDROID) - LIST (APPEND TENGINE_COMMON_OPTIONS "-fno-integrated-as") -ENDIF() - - # IF (TENGINE_COMPILER_GCC OR TENGINE_COMPILER_CLANG) IF (${TENGINE_FULL_CHECK})