fix symbolic links and other issues preventing publishing

Co-authored-by: Josh Matthews <josh@joshmatthews.net> Co-authored-by: Mukilan Thiyagarajan <mukilan@igalia.com> Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>
servo · Aug 30, 2024 · 0c048e3 · 0c048e3
1 parent b6a2125
commit 0c048e3
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 13 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -42,14 +42,14 @@ sparkle = { version = "0.1", optional = true }
 osmesa-sys = { version = "0.1", optional = true }
 rwh_05 = { package = "raw-window-handle", version = "0.5.2", features = ["std"], optional = true }
 rwh_06 = { package = "raw-window-handle", version = "0.6.2", features = ["std"], optional = true }
+serial_test = "3.1.0"
 
 [dev-dependencies]
 clap = "2"
 gl = "0.14"
 png = "0.17"
 rand = "0.8"
 winit = "0.29"
-serial_test = "3.1.0"
 
 [target.'cfg(target_os = "macos")'.dependencies]
 cgl = "0.3.2"

diff --git a/android-example/app/src/main/assets/blit.fs.glsl b/android-example/app/src/main/assets/blit.fs.glsl
@@ -1 +1 @@
-../../../../../surfman/resources/examples/blit.fs.glsl
+../../../../../resources/examples/blit.fs.glsl
diff --git a/android-example/app/src/main/assets/check.fs.glsl b/android-example/app/src/main/assets/check.fs.glsl
@@ -1 +1 @@
-../../../../../surfman/resources/examples/check.fs.glsl
+../../../../../resources/examples/check.fs.glsl
diff --git a/android-example/app/src/main/assets/grid.fs.glsl b/android-example/app/src/main/assets/grid.fs.glsl
@@ -1 +1 @@
-../../../../../surfman/resources/examples/grid.fs.glsl
+../../../../../resources/examples/grid.fs.glsl
diff --git a/android-example/app/src/main/assets/quad.vs.glsl b/android-example/app/src/main/assets/quad.vs.glsl
@@ -1 +1 @@
-../../../../../surfman/resources/examples/quad.vs.glsl
+../../../../../resources/examples/quad.vs.glsl
diff --git a/android-example/app/src/main/assets/tri.fs.glsl b/android-example/app/src/main/assets/tri.fs.glsl
@@ -1 +1 @@
-../../../../../surfman/resources/examples/tri.fs.glsl
+../../../../../resources/examples/tri.fs.glsl
diff --git a/android-example/app/src/main/assets/tri.vs.glsl b/android-example/app/src/main/assets/tri.vs.glsl
@@ -1 +1 @@
-../../../../../surfman/resources/examples/tri.vs.glsl
+../../../../../resources/examples/tri.vs.glsl
diff --git a/android-example/app/src/main/jniLibs/arm64-v8a/libsurfman_android_threads.so b/android-example/app/src/main/jniLibs/arm64-v8a/libsurfman_android_threads.so
diff --git a/android-example/rust/Cargo.toml b/android-example/rust/Cargo.toml
@@ -2,11 +2,11 @@
 name = "surfman_android_threads"
 version = "0.1.0"
 authors = ["Patrick Walton <pcwalton@mimiga.net>"]
-edition = "2018"
+edition = "2021"
 
 [lib]
 name = "main"
-crate_type = ["cdylib"]
+crate-type = ["cdylib"]
 
 [profile.dev]
 panic = "abort"
@@ -21,7 +21,8 @@ gl = "0.14"
 jni = "0.21"
 log = "0.4"
 surfman = { version = "0.9.4", features = [ "sm-test" ] }
-winit = { version = "0.29.10", features = [ "android-native-activity", "rwh_05" ] }
+winit = { version = "0.29.10", features = [ "android-native-activity", "rwh_06" ] }
+rwh_06 = { package = "raw-window-handle", version = "0.6" }
 
 [patch.crates-io]
 surfman = { path = "../../" }
diff --git a/android-example/rust/src/lib.rs b/android-example/rust/src/lib.rs
@@ -14,10 +14,10 @@ use log::Level;
 use std::cell::{Cell, RefCell};
 use std::mem;
 use std::thread::{self, JoinHandle};
-use surfman::platform::android::tests;
+use surfman::platform::egl::tests;
 use surfman::{Connection, NativeContext, NativeDevice};
 
-#[path = "../../../surfman/examples/threads.rs"]
+#[path = "../../../examples/threads.rs"]
 mod threads;
 
 thread_local! {