Rename everything.

Author: dvc94ch

.github/workflows/rust.yml

@@ -36,9 +36,9 @@ jobs:
 
     - name: Run tests
       run: |
-        cd android-ndk-sys && cargo test --features test && cd ..
-        cd android-ndk && cargo test --features rustdoc --doc && cd ..
-        cargo test -p android-build-tools
+        cd ndk-sys && cargo test --features test && cd ..
+        cd ndk && cargo test --features rustdoc --doc && cd ..
+        cargo test -p ndk-build
         cargo test -p cargo-apk
 
     - name: Install cargo-apk
@@ -50,5 +50,5 @@ jobs:
         export NDK_HOME="$GITHUB_WORKSPACE/android-ndk-r20"
         export CC="$NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/clang"
         export AR="$NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar"
-        cargo check -p android-ndk --target ${{ matrix.rust-target }}
-        cargo apk build -p android-examples --target ${{ matrix.rust-target }} --examples
+        cargo check -p ndk --target ${{ matrix.rust-target }}
+        cargo apk build -p ndk-examples --target ${{ matrix.rust-target }} --examples

Cargo.toml

@@ -1,9 +1,9 @@
 [workspace]
 members = [
-    "android-build-tools",
-    "android-examples",
-    "android-glue",
-    "android-ndk-sys",
-    "android-ndk",
+    "ndk",
+    "ndk-build",
+    "ndk-examples",
+    "ndk-glue",
+    "ndk-sys",
     "cargo-apk",
 ]

README.md

@@ -11,10 +11,10 @@ homepage = "https://github.com/rust-windowing/android-ndk-rs"
 repository = "https://github.com/rust-windowing/android-ndk-rs"
 
 [dependencies]
-android-build-tools = { path = "../android-build-tools" }
 cargo-subcommand = "0.4.3"
 env_logger = "0.7.1"
 exitfailure = "0.5.1"
 log = "0.4.8"
+ndk-build = { path = "../ndk-build" }
 serde = "1.0.104"
 toml = "0.5.6"

cargo-apk/Cargo.toml

@@ -1,12 +1,12 @@
 use crate::error::Error;
 use crate::manifest::Manifest;
-use android_build_tools::apk::{Apk, ApkConfig};
-use android_build_tools::cargo::{cargo_apk, VersionCode};
-use android_build_tools::config::Config;
-use android_build_tools::error::NdkError;
-use android_build_tools::ndk::Ndk;
-use android_build_tools::target::Target;
 use cargo_subcommand::{Artifact, CrateType, Profile, Subcommand};
+use ndk_build::apk::{Apk, ApkConfig};
+use ndk_build::cargo::{cargo_apk, VersionCode};
+use ndk_build::config::Config;
+use ndk_build::error::NdkError;
+use ndk_build::ndk::Ndk;
+use ndk_build::target::Target;
 use std::path::PathBuf;
 use std::process::Command;
 

cargo-apk/src/apk.rs

@@ -1,5 +1,5 @@
-use android_build_tools::error::NdkError;
 use cargo_subcommand::Error as SubcommandError;
+use ndk_build::error::NdkError;
 use std::fmt::{Display, Formatter, Result};
 use std::io::Error as IoError;
 use toml::de::Error as TomlError;

cargo-apk/src/error.rs

@@ -1,6 +1,6 @@
 use crate::error::Error;
-use android_build_tools::config::Metadata;
-use android_build_tools::target::Target;
+use ndk_build::config::Metadata;
+use ndk_build::target::Target;
 use serde::Deserialize;
 use std::path::Path;
 

cargo-apk/src/manifest.rs

@@ -1,5 +1,5 @@
 [package]
-name = "android-build-tools"
+name = "ndk-build"
 version = "0.1.0"
 authors = ["David Craven <[email protected]>"]
 edition = "2018"

android-build-tools/Cargo.toml renamed to ndk-build/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
-name = "android-examples"
+name = "ndk-examples"
 version = "0.1.0"
 authors = ["David Craven <[email protected]>"]
 edition = "2018"
 publish = false
 
 [target.'cfg(target_os = "android")'.dependencies]
-android-glue = { path = "../android-glue" }
+ndk-glue = { path = "../ndk-glue" }
 
 [[example]]
 name = "hello_world"

android-build-tools/src/apk.rs renamed to ndk-build/src/apk.rs

@@ -6,7 +6,7 @@ pub unsafe extern "C" fn ANativeActivity_onCreate(
     saved_state_size: usize,
 ) {
     std::env::set_var("RUST_BACKTRACE", "1");
-    android_glue::init(
+    ndk_glue::init(
         activity as _,
         saved_state as _,
         saved_state_size as _,

android-build-tools/src/cargo.rs renamed to ndk-build/src/cargo.rs

@@ -1,13 +1,13 @@
 [package]
-name = "android-glue"
+name = "ndk-glue"
 version = "0.1.0"
 authors = ["David Craven <[email protected]>"]
 edition = "2018"
 
 [dependencies]
 android_log-sys = "0.1.2"
-android-ndk-sys = { path = "../android-ndk-sys" }
-android-ndk = { path = "../android-ndk" }
+ndk = { path = "../ndk" }
+ndk-sys = { path = "../ndk-sys" }
 lazy_static = "1.4.0"
 libc = "0.2.66"
 log = "0.4.8"

android-build-tools/src/config.rs renamed to ndk-build/src/config.rs

@@ -1,10 +1,10 @@
-use android_ndk::input_queue::InputQueue;
-use android_ndk::looper::ThreadLooper;
-use android_ndk::native_activity::NativeActivity;
-use android_ndk::native_window::NativeWindow;
-use android_ndk_sys::{AInputQueue, ANativeActivity, ANativeWindow, ARect, ALOOPER_EVENT_INPUT};
 use lazy_static::lazy_static;
 use log::Level;
+use ndk::input_queue::InputQueue;
+use ndk::looper::ThreadLooper;
+use ndk::native_activity::NativeActivity;
+use ndk::native_window::NativeWindow;
+use ndk_sys::{AInputQueue, ANativeActivity, ANativeWindow, ARect, ALOOPER_EVENT_INPUT};
 use std::ffi::{CStr, CString};
 use std::fs::File;
 use std::io::{BufRead, BufReader};

android-build-tools/src/error.rs renamed to ndk-build/src/error.rs

@@ -1,6 +1,6 @@
 [package]
-name = "android-ndk-sys"
-version = "0.2.1"
+name = "ndk-sys"
+version = "0.1.0"
 authors = ["Mark Barbone <[email protected]>"]
 edition = "2018"
 description = "FFI bindings for the Android NDK"

android-build-tools/src/lib.rs renamed to ndk-build/src/lib.rs

@@ -1,5 +1,5 @@
 [package]
-name = "android-ndk"
+name = "ndk"
 version = "0.1.0"
 authors = ["Mark Barbone <[email protected]>"]
 edition = "2018"
@@ -30,6 +30,5 @@ version = "0.0.10"
 optional = true
 
 [dependencies.ffi]
-package = "android-ndk-sys"
-path = "../android-ndk-sys"
-version = "0.2"
+package = "ndk-sys"
+path = "../ndk-sys"