aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-14 19:29:13 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-14 19:29:13 +0000
commitec65a549f71eff6944e304d5a17143469e71eaa3 (patch)
tree6ee7f81a49b1253ad675dc236c145c7cb18f16c0
parent6acdffc0411ac8efe95c0ca72b27136cd0f88f64 (diff)
parentdc8a7a141d27db878878e2668f18542bf01b4781 (diff)
downloadcrossbeam-epoch-ec65a549f71eff6944e304d5a17143469e71eaa3.tar.gz
Migrate to cargo_embargo. am: 8ba44e9aae am: fbe8cc2a02 am: dc8a7a141d
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/crossbeam-epoch/+/2829795 Change-Id: I3a1342d9be55cdf2b734cb9c3818fe6cb00d3333 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp2
-rw-r--r--cargo2android.json5
-rw-r--r--cargo_embargo.json3
3 files changed, 4 insertions, 6 deletions
diff --git a/Android.bp b/Android.bp
index a05ed8f..4ca15d2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// 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.
package {
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
+}