aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-13 22:43:12 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-13 22:43:12 +0000
commit415aa3852546e244666dd4ac61d20ab359fbcf22 (patch)
tree1c2c2e42823b3126dc945ed3ec2a6aeee86acdbf
parentf312e6278a95ff5da11bfa5d8b5708a5835b901b (diff)
parent320f6c6fd91029e7ce58afb6c9d94737b3d90f73 (diff)
downloadthread_local-415aa3852546e244666dd4ac61d20ab359fbcf22.tar.gz
Migrate to cargo_embargo. am: c952b7aca2 am: d318d783fc am: 320f6c6fd9
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thread_local/+/2828131 Change-Id: Ifc912297274fa88349829f1d972271fba69c5422 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.json4
3 files changed, 5 insertions, 6 deletions
diff --git a/Android.bp b/Android.bp
index 33cd835..3603234 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..c8842d1
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,4 @@
+{
+ "run_cargo": false,
+ "tests": true
+}