Skip to content

Commit cc5a888

Browse files
committed
Merge 'Initial android support'
This gets android into a somewhat usable state. Still news a few follow ups. William Casarin (9): nix: add $ANDROID_JAR helper to shell add input context menu helper thread: enable selectable text in threads universe: add full tabs android: fix build dave: initial android fixes android: arboard clipboard support android: add initial ci Merge 'Initial android support'
2 parents e8d240d + 012ff9d commit cc5a888

File tree

23 files changed

+947
-643
lines changed

23 files changed

+947
-643
lines changed

.envrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# set to false if you don't care to include android stuff
22
export use_android=true
33
export android_emulator=false
4+
export ANDROID_DIR=crates/notedeck_chrome/android
45

56
use nix --arg use_android $use_android --arg android_emulator $android_emulator
67

.github/workflows/rust.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,28 @@ jobs:
2222
cargo fmt --all -- --check
2323
cargo clippy
2424
25+
android:
26+
name: Check (android)
27+
runs-on: ubuntu-22.04
28+
steps:
29+
- uses: actions/checkout@v4
30+
- uses: dtolnay/rust-toolchain@stable
31+
with:
32+
components: rustfmt,clippy
33+
- name: Setup Java JDK
34+
uses: actions/[email protected]
35+
with:
36+
java-version: '17'
37+
distribution: 'temurin'
38+
- name: Setup Android SDK
39+
uses: android-actions/setup-android@v3
40+
- name: Add android rust target
41+
run: rustup target add aarch64-linux-android
42+
- name: Install Cargo NDK
43+
run: cargo install cargo-ndk
44+
- name: Run tests
45+
run: make jni-check
46+
2547
linux-test:
2648
name: Test (Linux)
2749
uses: ./.github/workflows/build-and-test.yml

0 commit comments

Comments
 (0)