aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-16 21:51:46 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-16 21:51:46 +0000
commit17ec61c02f65ece620c1ece4115da45f5d86fbdc (patch)
tree1a6a310af815d7f498eeb1010abf672c5929905d
parenta6f1c7993949b2050eca410ebc77c6e3348b4035 (diff)
parentbc34fb98ead3f29687aa05cd01bf6c2d58e3653b (diff)
downloadoid-registry-17ec61c02f65ece620c1ece4115da45f5d86fbdc.tar.gz
Migrate to cargo_embargo. am: bc34fb98ea
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/oid-registry/+/2832425 Change-Id: I47b773280c705e1b75a5621549e4aa5f3058fa54 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp10
-rw-r--r--cargo2android.json11
-rw-r--r--cargo_embargo.json16
3 files changed, 19 insertions, 18 deletions
diff --git a/Android.bp b/Android.bp
index 23d14ac..58d983e 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 {
@@ -66,9 +66,7 @@ rust_library {
"x509",
"x962",
],
- rustlibs: [
- "libder_parser",
- ],
+ rustlibs: ["libder_parser"],
apex_available: [
"//apex_available:platform",
"com.android.virt",
@@ -104,7 +102,5 @@ rust_test {
"x509",
"x962",
],
- rustlibs: [
- "libder_parser",
- ],
+ rustlibs: ["libder_parser"],
}
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 322cd70..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "apex-available": [
- "//apex_available:platform",
- "com.android.virt"
- ],
- "copy-out": true,
- "device": true,
- "features": "crypto,x509",
- "run": true,
- "tests": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..2ff35b0
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,16 @@
+{
+ "apex_available": [
+ "//apex_available:platform",
+ "com.android.virt"
+ ],
+ "features": [
+ "crypto",
+ "x509"
+ ],
+ "package": {
+ "oid-registry": {
+ "copy_out": true
+ }
+ },
+ "tests": true
+}