Snap for 11135399 from bc34fb98ead3f29687aa05cd01bf6c2d58e3653b to simpleperf-release
Change-Id: I0fb5dcdb3249f7d567ca782b0af63f3d0c4caa82
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 @@
"x509",
"x962",
],
- rustlibs: [
- "libder_parser",
- ],
+ rustlibs: ["libder_parser"],
apex_available: [
"//apex_available:platform",
"com.android.virt",
@@ -104,7 +102,5 @@
"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
+}