Skip to content

Commit

Permalink
Removes ndk-glue + ndk-macro as part of rust-mobile#372 modularization
Browse files Browse the repository at this point in the history
The ndk-glue and ndk-macro subdirectores have been split into a
stand-alone repository at: https://github.com/rust-mobile/ndk-glue

This is being done as part of the modularization effort described in
issue rust-mobile#372

The stand-alone repository was filtered like this:

```
git clone https://github.com/newren/git-filter-repo
git clone https://github.com/rust-windowing/android-ndk-rs.git ndk-glue
cd ndk-glue
py ../git-filter-repo/git-filter-repo \
    --path ndk-glue --path ndk-macro \
    --path ndk-examples --path-rename ndk-examples:examples \
    --path LICENSE-APACHE --path LICENSE-MIT \
    --path Cargo.toml --path rustfmt.toml \
    --path .github --path .gitignore
```

The last commit in this repo that is included within the
stand-alone repository is 107f03e

Although ndk-glue is also being deprecated at the same time as
splitting it out this commit doesn't make any README changes for
this repo yet which will be addressed separately.
  • Loading branch information
rib committed Dec 6, 2022
1 parent c47e6c3 commit 7d2255c
Show file tree
Hide file tree
Showing 15 changed files with 1 addition and 1,421 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@ jobs:
crate:
- { name: "ndk-sys", target: "armv7-linux-androideabi" }
- { name: "ndk", target: "armv7-linux-androideabi" }
- { name: "ndk-macro", target: "x86_64-unknown-linux-gnu" }
- { name: "ndk-context", target: "armv7-linux-androideabi" }
- { name: "ndk-glue", target: "armv7-linux-androideabi" }
- { name: "ndk-build", target: "x86_64-unknown-linux-gnu" }
- { name: "cargo-apk", target: "x86_64-unknown-linux-gnu" }
steps:
Expand Down
8 changes: 0 additions & 8 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -206,14 +206,6 @@ jobs:
run:
cargo test -p ndk-build --all-features

- name: Test ndk-glue
run:
cargo test -p ndk-glue --all-features

- name: Test ndk-macro
run:
cargo test -p ndk-macro --all-features

- name: Test cargo-apk
run:
cargo test -p cargo-apk --all-features
Expand Down
2 changes: 0 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@
members = [
"ndk",
"ndk-context",
"ndk-macro",
"ndk-build",
"ndk-examples",
"ndk-glue",
"ndk-sys",
"cargo-apk",
]
2 changes: 1 addition & 1 deletion ndk-examples/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ libc = "0.2"
log = "0.4.14"
ndk = { path = "../ndk", features = ["api-level-23"] }
ndk-context = { path = "../ndk-context" }
ndk-glue = { path = "../ndk-glue", features = ["logger"] }
ndk-glue = { version = "0.7", features = ["logger"] }

[[example]]
name = "hello_world"
Expand Down
76 changes: 0 additions & 76 deletions ndk-glue/CHANGELOG.md

This file was deleted.

38 changes: 0 additions & 38 deletions ndk-glue/Cargo.toml

This file was deleted.

6 changes: 0 additions & 6 deletions ndk-glue/README.md

This file was deleted.

Loading

0 comments on commit 7d2255c

Please sign in to comment.