未验证 提交 4ee982de 编写于 作者: N nihui 提交者: GitHub

migrate ci android ndk-bundle to ANDROID_NDK_LATEST_HOME env (#1369)

* migrate ci android ndk-bundle to ANDROID_NDK_LATEST_HOME env

* drop fno-integrated-as for fixing build with new android ndk
上级 80a41c8b
...@@ -21,7 +21,7 @@ jobs: ...@@ -21,7 +21,7 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: configure - 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 - name: build
run: cmake --build build -j 2 run: cmake --build build -j 2
...@@ -31,7 +31,7 @@ jobs: ...@@ -31,7 +31,7 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: configure - 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 - name: build
run: cmake --build build -j 2 run: cmake --build build -j 2
......
...@@ -59,11 +59,6 @@ IF (OHOS) ...@@ -59,11 +59,6 @@ IF (OHOS)
ENDIF() ENDIF()
ENDIF() ENDIF()
IF (ANDROID)
LIST (APPEND TENGINE_COMMON_OPTIONS "-fno-integrated-as")
ENDIF()
# #
IF (TENGINE_COMPILER_GCC OR TENGINE_COMPILER_CLANG) IF (TENGINE_COMPILER_GCC OR TENGINE_COMPILER_CLANG)
IF (${TENGINE_FULL_CHECK}) IF (${TENGINE_FULL_CHECK})
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册