re-organizing project/dir layout

re-organizing project/dir layouts
* Refactors projects/build into separate packages for android and non-android builds.
* fixes gradlew file encoding.

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "alvr/openxr-client/cpp/ALVR-OpenXR-Engine"]
 	path = alvr/openxr-client/cpp/ALVR-OpenXR-Engine
 	url = https://github.com/korejan/ALVR-OpenXR-Engine.git
+[submodule "alvr/openxr-client/common/cpp/ALVR-OpenXR-Engine"]
+	path = alvr/openxr-client/common/cpp/ALVR-OpenXR-Engine
+	url = https://github.com/korejan/ALVR-OpenXR-Engine.git

Cargo.toml

@@ -14,7 +14,8 @@ members = [
     "alvr/launcher",
     "alvr/vrcompositor-wrapper",
     "alvr/vulkan-layer",
-    "alvr/openxr-client",
+    "alvr/openxr-client/oxr-client",
+    "alvr/openxr-client/oxr-android-client",
     "alvr/xtask",
     "alvr/experiments/client",     # needed for bug in cargo-subcommand
     "alvr/experiments/*",

alvr/openxr-client/common/Cargo.toml

@@ -0,0 +1,44 @@
+[package]
+name = "oxr_common"
+version = "0.1.0"
+authors = ["korejan <[email protected]>"]
+edition = "2018"
+
+[features]
+# default = ["settings-schema_legacy"]
+# default = ["new_dashboard"]
+# new_dashboard = ["settings-schema"]
+
+[dependencies]
+# Basic utilities
+lazy_static = "1"
+parking_lot = "0.11"
+rand = "0.8"
+# Serialization
+serde = "1"
+serde_json = "1"
+bincode = "1"
+settings-schema = { path = "../../settings-schema", features = ["rename_camel_case"] }
+# Async and networking
+bytes = "1"
+futures = "0.3"
+tokio = { version = "1", features = ["rt-multi-thread", "macros", "time"] }
+# Miscellaneous
+alvr_common = { path = "../../common" }
+#alvr_audio = { path = "../audio" }
+alvr_session = { path = "../../session" }
+alvr_sockets = { path = "../../sockets" }
+
+cpal = "0.13"
+log = "0.4"
+nalgebra = "0.26"
+semver = "1"
+local_ipaddress = "0.1.3"
+structopt = "0.3.22"
+
+[build-dependencies]
+cmake = "0.1"
+bindgen = "0.59"
+cc = { version = "1", features = ["parallel"] }
+walkdir = "2"
+target-lexicon = "0.12"

alvr/openxr-client/build.rs → alvr/openxr-client/common/build.rs

@@ -44,13 +44,13 @@ fn main() {
     let profile = env::var("PROFILE").unwrap();
     let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
     let project_dir = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap());
-    assert!(project_dir.ends_with("openxr-client"));
+    assert!(project_dir.ends_with("common"));//"openxr-client"));
 
     let xr_engine_dir = project_dir.join("cpp/ALVR-OpenXR-Engine");
     let xr_engine_src_dir = xr_engine_dir.join("src");
 
     let android_dir = project_dir.join("android");
-    let alvr_common_cpp_dir = project_dir.join("../client/android/ALVR-common");
+    let alvr_common_cpp_dir = project_dir.join("../../client/android/ALVR-common");
 
     let file_filters = vec!["CMakeLists.txt", "AndroidManifest.xml"];
     let file_ext_filters = vec![