From 255806ff693f9305cff249bad94b221394ba1071 Mon Sep 17 00:00:00 2001
From: Michel Heily <michelheily@gmail.com>
Date: Mon, 5 Sep 2022 00:02:00 +0300
Subject: [PATCH] Move rustbodyadvance-jni to platform/

Former-commit-id: c4565bfe5bf7c4887b6b86c44afbf6b55ac76811
Former-commit-id: b3f296200b0a718ba5509db0cce1117e0fb38a1a
---
 Cargo.toml                                                   | 2 +-
 README.md                                                    | 5 +++--
 platform/android/app/build.gradle                            | 2 +-
 {bindings => platform}/rustboyadvance-jni/Cargo.toml         | 0
 .../rustboyadvance-jni/src/audio/connector.rs                | 0
 {bindings => platform}/rustboyadvance-jni/src/audio/mod.rs   | 0
 .../rustboyadvance-jni/src/audio/thread.rs                   | 0
 {bindings => platform}/rustboyadvance-jni/src/emulator.rs    | 0
 {bindings => platform}/rustboyadvance-jni/src/lib.rs         | 0
 {bindings => platform}/rustboyadvance-jni/src/rom_helper.rs  | 0
 10 files changed, 5 insertions(+), 4 deletions(-)
 rename {bindings => platform}/rustboyadvance-jni/Cargo.toml (100%)
 rename {bindings => platform}/rustboyadvance-jni/src/audio/connector.rs (100%)
 rename {bindings => platform}/rustboyadvance-jni/src/audio/mod.rs (100%)
 rename {bindings => platform}/rustboyadvance-jni/src/audio/thread.rs (100%)
 rename {bindings => platform}/rustboyadvance-jni/src/emulator.rs (100%)
 rename {bindings => platform}/rustboyadvance-jni/src/lib.rs (100%)
 rename {bindings => platform}/rustboyadvance-jni/src/rom_helper.rs (100%)

diff --git a/Cargo.toml b/Cargo.toml
index 3319548..56ebd92 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,7 +7,7 @@ members = [
     "platform/rustboyadvance-libretro",
     "platform/rustboyadvance-minifb",
     "platform/rustboyadvance-wasm",
-    "bindings/rustboyadvance-jni",
+    "platform/rustboyadvance-jni",
     "fps_bench"
 ]
 
diff --git a/README.md b/README.md
index 7e71eb5..3ce1487 100644
--- a/README.md
+++ b/README.md
@@ -12,12 +12,13 @@ Nintendo GameBoy Advance ™ emulator and debugger, written in rust.
 WebAssembly Demo: https://michelhe.github.io/rustboyadvance-ng/ ![Deploy](https://github.com/michelhe/rustboyadvance-ng/workflows/Deploy/badge.svg?branch=master)
 
 # Project Structure
-* `core/` - Main emulator crate
-* `bindings/` - Bindings to other languages. Currently only java binidings through JNI.
+* `core/` - Main emulator crate that ties everything together 
+* `arm7tdmi/` - Emulation of the Arm7tdmi processor.
 * `platform/` - Constains executables & application built with `rustboyadvance-core`
     * `platform/rustbodyadvance-wasm` - Web emulator powered by WebAssembly
     * `platform/rustbodyadvance-sdl2` - Desktop application built with sdl2
     * `platform/rustbodyadvance-minifb` - Desktop application built with minifb, *not maintained*.
+    * `platform/rustbodyadvance-jni` - Java JNI binidngs for the emulator.
     * `platform/android` - A PoC Android application.
 
 # Progress
diff --git a/platform/android/app/build.gradle b/platform/android/app/build.gradle
index 07fd3f8..fe9f261 100644
--- a/platform/android/app/build.gradle
+++ b/platform/android/app/build.gradle
@@ -25,7 +25,7 @@ cargo {
     prebuiltToolchains = true
     verbose = true
     profile = 'release'
-    module = "../../../bindings/rustboyadvance-jni"
+    module = "../../../platform/rustboyadvance-jni"
     targetDirectory = '../../../target'
     libname = "rustboyadvance_jni"
     targets = ['x86', 'arm64']
diff --git a/bindings/rustboyadvance-jni/Cargo.toml b/platform/rustboyadvance-jni/Cargo.toml
similarity index 100%
rename from bindings/rustboyadvance-jni/Cargo.toml
rename to platform/rustboyadvance-jni/Cargo.toml
diff --git a/bindings/rustboyadvance-jni/src/audio/connector.rs b/platform/rustboyadvance-jni/src/audio/connector.rs
similarity index 100%
rename from bindings/rustboyadvance-jni/src/audio/connector.rs
rename to platform/rustboyadvance-jni/src/audio/connector.rs
diff --git a/bindings/rustboyadvance-jni/src/audio/mod.rs b/platform/rustboyadvance-jni/src/audio/mod.rs
similarity index 100%
rename from bindings/rustboyadvance-jni/src/audio/mod.rs
rename to platform/rustboyadvance-jni/src/audio/mod.rs
diff --git a/bindings/rustboyadvance-jni/src/audio/thread.rs b/platform/rustboyadvance-jni/src/audio/thread.rs
similarity index 100%
rename from bindings/rustboyadvance-jni/src/audio/thread.rs
rename to platform/rustboyadvance-jni/src/audio/thread.rs
diff --git a/bindings/rustboyadvance-jni/src/emulator.rs b/platform/rustboyadvance-jni/src/emulator.rs
similarity index 100%
rename from bindings/rustboyadvance-jni/src/emulator.rs
rename to platform/rustboyadvance-jni/src/emulator.rs
diff --git a/bindings/rustboyadvance-jni/src/lib.rs b/platform/rustboyadvance-jni/src/lib.rs
similarity index 100%
rename from bindings/rustboyadvance-jni/src/lib.rs
rename to platform/rustboyadvance-jni/src/lib.rs
diff --git a/bindings/rustboyadvance-jni/src/rom_helper.rs b/platform/rustboyadvance-jni/src/rom_helper.rs
similarity index 100%
rename from bindings/rustboyadvance-jni/src/rom_helper.rs
rename to platform/rustboyadvance-jni/src/rom_helper.rs