aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-10 21:19:17 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-10 21:19:17 +0000
commit996b2a1ffdf0df2e277d2672c69677157888a23b (patch)
tree269aa8b8f3807b9a713a516bd1088983f81da7c2
parent11cf9bda2155b1faa307d743205473acce50f57e (diff)
parentf07fe9c96e2f998db2824f37e191b60eb5232a85 (diff)
downloadgoogletest_macro-996b2a1ffdf0df2e277d2672c69677157888a23b.tar.gz
Migrate to cargo_embargo. am: 739f6f2658 am: 07a8788194 am: f07fe9c96e
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/googletest_macro/+/2824797 Change-Id: I841262851be1ab70b00e0bdb9b327e91b9309f8d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp4
-rw-r--r--cargo2android.json5
-rw-r--r--cargo_embargo.json3
3 files changed, 4 insertions, 8 deletions
diff --git a/Android.bp b/Android.bp
index 480a3bc..b0585b0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,8 +1,6 @@
-// This file is generated by cargo2android.py --config cargo2android.json.
+// This file is generated by cargo_embargo.
// Do not modify this file as changes will be overridden on upgrade.
-
-
rust_proc_macro {
name: "libgoogletest_macro",
crate_name: "googletest_macro",
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index d36fb44..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "device": true,
- "run": true,
- "tests": true
-} \ No newline at end of file
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..9a0a579
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,3 @@
+{
+ "tests": true
+}