Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update ndk to 0.8 #57

Merged
merged 4 commits into from
Jan 27, 2024
Merged

update ndk to 0.8 #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
acce33f
update ndk to 0.8
mockersf Jan 18, 2024
5dbaf33
try to fix CI
mockersf Jan 23, 2024
a83eddd
update android version
mockersf Jan 23, 2024
19321e9
disable ndk default features
mockersf Jan 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 18 additions & 29 deletions .github/workflows/rust.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,12 @@ jobs:
java-version: 17
- name: Setup Android SDK
uses: android-actions/setup-android@v2
- name: Setup Android SDK packages
uses: maxim-lobanov/setup-android-tools@v1
with:
packages: |
build-tools;${{ env.SDK_BUILD_TOOLS_VERSION }}
cmdline-tools;${{ env.SDK_CMDLINE_TOOLS_VERSION }}
ndk;${{ env.NDK_VERSION }}
platforms;android-21
cache: true
- name: Set Up Android tools
run: |
${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT --install "build-tools;${{ env.SDK_BUILD_TOOLS_VERSION }}"
${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT --install "cmdline-tools;${{ env.SDK_CMDLINE_TOOLS_VERSION }}"
${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT --install "ndk;${{ env.NDK_VERSION }}"
${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT --install "platforms;android-30"
- name: Config Android NDK
env:
TRIPLE: x86_64-linux-android
Expand Down Expand Up @@ -118,17 +115,12 @@ jobs:
java-version: 17
- name: Setup Android SDK
uses: android-actions/setup-android@v2
- run: |
echo "NDK_VERSION=25.2.9519653" >> $GITHUB_ENV
- name: Setup Android SDK packages
uses: maxim-lobanov/setup-android-tools@v1
with:
packages: |
build-tools;${{ env.SDK_BUILD_TOOLS_VERSION }}
cmdline-tools;${{ env.SDK_CMDLINE_TOOLS_VERSION }}
ndk;${{ env.NDK_VERSION }}
platforms;android-21
cache: true
- name: Set Up Android tools
run: |
${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT --install "build-tools;${{ env.SDK_BUILD_TOOLS_VERSION }}"
${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT --install "cmdline-tools;${{ env.SDK_CMDLINE_TOOLS_VERSION }}"
${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT --install "ndk;${{ env.NDK_VERSION }}"
${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT --install "platforms;android-30"
- name: Config Android NDK
run: |
echo "$ANDROID_SDK_ROOT/ndk/$NDK_VERSION/toolchains/llvm/prebuilt/linux-x86_64/bin" >> $GITHUB_PATH
Expand Down Expand Up @@ -234,15 +226,12 @@ jobs:
java-version: 17
- name: Setup Android SDK
uses: android-actions/setup-android@v2
- name: Setup Android SDK packages
uses: maxim-lobanov/setup-android-tools@v1
with:
packages: |
build-tools;${{ env.SDK_BUILD_TOOLS_VERSION }}
cmdline-tools;${{ env.SDK_CMDLINE_TOOLS_VERSION }}
ndk-bundle
platforms;android-21
cache: true
- name: Set Up Android tools
run: |
${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT --install "build-tools;${{ env.SDK_BUILD_TOOLS_VERSION }}"
${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT --install "cmdline-tools;${{ env.SDK_CMDLINE_TOOLS_VERSION }}"
${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT --install "ndk;${{ env.NDK_VERSION }}"
${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT --install "platforms;android-30"
- name: Setup Rust
uses: hecrj/setup-rust-action@v1
with:
Expand Down
3 changes: 2 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@ version = "0.5.0"
path = "sys"

[dependencies.ndk]
version = "0.7"
version = "0.8"
optional = true
default-features = false

[dependencies.ndk-context]
version = "0.1"
Expand Down