summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-09 16:22:08 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-09 16:22:08 +0000
commit151f99cb7aafb8f464c3e588c8b4132525a5592b (patch)
treec91e07b0edf8b78d067e9f360fbe8bef3c48608f
parent0ae264cd0c00e707fe7757ae0f00bca59535673c (diff)
parent87524cd8fc470a1bde44cee4a6edea3bd194bee7 (diff)
downloadder-oid-macro-151f99cb7aafb8f464c3e588c8b4132525a5592b.tar.gz
Migrate to cargo_embargo. am: d9f0633011 am: 4ce36623e3 am: 87524cd8fc
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/der-oid-macro/+/2822113 Change-Id: I4dd4a52a3a6210d6ad663e5ff7ddcfb245c9c8ec Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp2
-rw-r--r--cargo2android.json4
-rw-r--r--cargo_embargo.json3
3 files changed, 4 insertions, 5 deletions
diff --git a/Android.bp b/Android.bp
index bf1b043..9392c24 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 bf78496..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "device": true,
- "run": true
-} \ No newline at end of file
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..cb908d7
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,3 @@
+{
+ "run_cargo": false
+}