Snap for 11135399 from 5d3e5dc1bd767a5e3cd51b36492bebd5735a7d73 to simpleperf-release

Change-Id: Ia3acb5bc256114c437cdbce8385b63e1f89e1a03

7 files changed, 81 insertions, 26 deletions

diff --git a/Android.bp b/Android.bp
index 7a44be6..ce274cc 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 {
@@ -82,7 +82,8 @@ rust_library_rlib {
     product_available: true,
     vendor_available: true,
     visibility: [
-         "//system/keymint:__subpackages__",
-    ]
-    ,
+        "//packages/modules/Virtualization:__subpackages__",
+        "//system/keymint:__subpackages__",
+    ],
+
 }
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index e6baa85..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.virt"
-  ],
-  "run": true,
-  "vendor-available": true,
-  "features": "alloc",
-  "variants": [
-    {
-    },
-    {
-      "device": true,
-      "no-host": true,
-      "add-module-block": "cargo2android_viz.bp",
-      "dependency_suffix": "_nostd",
-      "force-rlib": true,
-      "suffix": "_nostd",
-      "no-std": true
-    }
-  ]
-}
diff --git a/cargo2android_viz.bp b/cargo2android_viz.bp
index 6912520..8ce03b7 100644
--- a/cargo2android_viz.bp
+++ b/cargo2android_viz.bp
@@ -1,3 +1,4 @@
 visibility: [
+     "//packages/modules/Virtualization:__subpackages__",
      "//system/keymint:__subpackages__",
 ]
diff --git a/cargo2rulesmk.json b/cargo2rulesmk.json
new file mode 100644
index 0000000..4243146
--- /dev/null
+++ b/cargo2rulesmk.json
@@ -0,0 +1,4 @@
+{
+  "features": "alloc",
+  "patch": "patches/rules.mk.diff"
+}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..1a8911c
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,36 @@
+{
+  "apex_available": [
+    "//apex_available:platform",
+    "com.android.virt"
+  ],
+  "features": [
+    "alloc"
+  ],
+  "run_cargo": false,
+  "variants": [
+    {
+      "package": {
+        "pkcs1": {
+          "device_supported": false
+        }
+      }
+    },
+    {
+      "module_name_overrides": {
+        "libder": "libder_nostd",
+        "libpkcs1": "libpkcs1_nostd",
+        "libpkcs8": "libpkcs8_nostd",
+        "libspki": "libspki_nostd",
+        "libzeroize": "libzeroize_nostd"
+      },
+      "package": {
+        "pkcs1": {
+          "add_module_block": "cargo2android_viz.bp",
+          "force_rlib": true,
+          "host_supported": false,
+          "no_std": true
+        }
+      }
+    }
+  ]
+}
diff --git a/patches/rules.mk.diff b/patches/rules.mk.diff
new file mode 100644
index 0000000..5e7ca8a
--- /dev/null
+++ b/patches/rules.mk.diff
@@ -0,0 +1,13 @@
+diff --git a/rules.mk b/rules.mk
+index b31c531..6b9ef75 100644
+--- a/rules.mk
++++ b/rules.mk
+@@ -15,6 +15,8 @@ MODULE_RUSTFLAGS += \
+ 
+ MODULE_LIBRARY_DEPS := \
+ 	external/rust/crates/der \
++	external/rust/crates/pkcs8 \
+ 	external/rust/crates/spki \
++	external/rust/crates/zeroize \
+ 
+ include make/library.mk
diff --git a/rules.mk b/rules.mk
new file mode 100644
index 0000000..6b9ef75
--- /dev/null
+++ b/rules.mk
@@ -0,0 +1,22 @@
+# This file is generated by cargo2rulesmk.py --run --config cargo2rulesmk.json.
+# Do not modify this file as changes will be overridden on upgrade.
+
+LOCAL_DIR := $(GET_LOCAL_DIR)
+MODULE := $(LOCAL_DIR)
+MODULE_CRATE_NAME := pkcs1
+MODULE_SRCS := \
+	$(LOCAL_DIR)/src/lib.rs \
+
+MODULE_RUST_EDITION := 2021
+MODULE_RUSTFLAGS += \
+	--cfg 'feature="alloc"' \
+	--cfg 'feature="pkcs8"' \
+	--cfg 'feature="zeroize"' \
+
+MODULE_LIBRARY_DEPS := \
+	external/rust/crates/der \
+	external/rust/crates/pkcs8 \
+	external/rust/crates/spki \
+	external/rust/crates/zeroize \
+
+include make/library.mk