aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-10 19:20:51 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-10 19:20:51 +0000
commit07a878819413a910ed2c3606da7080a6cbb7aa1a (patch)
tree269aa8b8f3807b9a713a516bd1088983f81da7c2
parentdab154af91150fb2627571ee3c99ac84e434d316 (diff)
parent739f6f2658b4a80ad9a328c0ebb49f0b06a6a67d (diff)
downloadgoogletest_macro-07a878819413a910ed2c3606da7080a6cbb7aa1a.tar.gz
Migrate to cargo_embargo. am: 739f6f2658
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/googletest_macro/+/2824797 Change-Id: I7b1722e66e795aacfee7f40e0dc115cec52997be 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
+}