rusty-gd: move facade_helpers to facade/helpers

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost
Change-Id: Ie392496d731a7f589e40e0c6ce30d7b7c39dead6

diff --git a/gd/rust/facade/Android.bp b/gd/rust/facade/Android.bp
index 7751d38..2632be2 100644 (file)
--- a/gd/rust/facade/Android.bp
+++ b/gd/rust/facade/Android.bp
@@ -33,3 +33,22 @@ rust_binary {
       "liblog_rust",
     ],
 }
+
+rust_library {
+    name: "libbt_facade_helpers",
+    defaults: ["gd_rust_defaults"],
+    crate_name: "bt_facade_helpers",
+    srcs: ["helpers/lib.rs"],
+    edition: "2018",
+    rustlibs: [
+        "libbt_facade_proto",
+        "libbt_packets",
+        "libbytes",
+        "libfutures",
+        "libgrpcio",
+        "libtokio",
+        "libprotobuf",
+        "liblog_rust",
+        "libcxx",
+    ],
+}

diff --git a/gd/rust/facade_helpers/src/lib.rs b/gd/rust/facade/helpers/lib.rs
similarity index 100%
rename from gd/rust/facade_helpers/src/lib.rs
rename to gd/rust/facade/helpers/lib.rs

diff --git a/gd/rust/facade_helpers/Android.bp b/gd/rust/facade_helpers/Android.bp
deleted file mode 100644 (file)
index 5bb852c..0000000
--- a/gd/rust/facade_helpers/Android.bp
+++ /dev/null
@@ -1,18 +0,0 @@
-rust_library {
-    name: "libbt_facade_helpers",
-    defaults: ["gd_rust_defaults"],
-    crate_name: "bt_facade_helpers",
-    srcs: ["src/lib.rs"],
-    edition: "2018",
-    rustlibs: [
-        "libbt_facade_proto",
-        "libbt_packets",
-        "libbytes",
-        "libfutures",
-        "libgrpcio",
-        "libtokio",
-        "libprotobuf",
-        "liblog_rust",
-        "libcxx",
-    ],
-}