From 26c5fb530d0ba6c24dd66d7e72bed0654645b820 Mon Sep 17 00:00:00 2001
From: Zach Johnson <zachoverflow@google.com>
Date: Fri, 22 Jan 2021 14:33:36 -0800
Subject: [PATCH] rusty-gd: move gddi-macros to gddi/macros

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost
Change-Id: I30b553a92539212bbe7456c3f4794706d3e8950e
---
 gd/rust/gddi-macros/Android.bp                  | 11 -----------
 gd/rust/gddi/Android.bp                         | 12 ++++++++++++
 gd/rust/{gddi-macros/src => gddi/macros}/lib.rs |  0
 3 files changed, 12 insertions(+), 11 deletions(-)
 delete mode 100644 gd/rust/gddi-macros/Android.bp
 rename gd/rust/{gddi-macros/src => gddi/macros}/lib.rs (100%)

diff --git a/gd/rust/gddi-macros/Android.bp b/gd/rust/gddi-macros/Android.bp
deleted file mode 100644
index 6abd03ccc..000000000
--- a/gd/rust/gddi-macros/Android.bp
+++ /dev/null
@@ -1,11 +0,0 @@
-rust_proc_macro {
-    name: "libgddi_macros",
-    crate_name: "gddi_macros",
-    srcs: ["src/lib.rs"],
-    edition: "2018",
-    rustlibs: [
-        "libproc_macro2",
-        "libquote",
-        "libsyn",
-    ],
-}
diff --git a/gd/rust/gddi/Android.bp b/gd/rust/gddi/Android.bp
index ab30aa1d8..bb7110957 100644
--- a/gd/rust/gddi/Android.bp
+++ b/gd/rust/gddi/Android.bp
@@ -7,3 +7,15 @@ rust_library {
     proc_macros: ["libgddi_macros"],
     rustlibs: ["libtokio"],
 }
+
+rust_proc_macro {
+    name: "libgddi_macros",
+    crate_name: "gddi_macros",
+    srcs: ["macros/lib.rs"],
+    edition: "2018",
+    rustlibs: [
+        "libproc_macro2",
+        "libquote",
+        "libsyn",
+    ],
+}
diff --git a/gd/rust/gddi-macros/src/lib.rs b/gd/rust/gddi/macros/lib.rs
similarity index 100%
rename from gd/rust/gddi-macros/src/lib.rs
rename to gd/rust/gddi/macros/lib.rs
-- 
2.11.0