aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-09 14:02:42 +0000
committerAndrew Walbran <qwandor@google.com>2023-11-09 14:02:42 +0000
commitd939d4fef19440a6a8b18eb174668ff25dd67218 (patch)
tree39639f80a777a5c403086198b1a0fe2904c979b6
parent3f57e9c059e63573b8449e21de09f87ebf636990 (diff)
downloadrand_core-d939d4fef19440a6a8b18eb174668ff25dd67218.tar.gz
Migrate to cargo_embargo.
Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: I2c3a80dbd795b12ec78d3d507495c7b864aadf2f
-rw-r--r--Android.bp10
-rw-r--r--cargo2android.json12
-rw-r--r--cargo_embargo.json11
3 files changed, 14 insertions, 19 deletions
diff --git a/Android.bp b/Android.bp
index 841b4e1..12d95c4 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 {
@@ -51,9 +51,7 @@ rust_library {
"getrandom",
"std",
],
- rustlibs: [
- "libgetrandom",
- ],
+ rustlibs: ["libgetrandom"],
apex_available: [
"//apex_available:platform",
"com.android.virt",
@@ -80,7 +78,5 @@ rust_test {
"getrandom",
"std",
],
- rustlibs: [
- "libgetrandom",
- ],
+ rustlibs: ["libgetrandom"],
}
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 8945bb0..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "apex-available": [
- "//apex_available:platform",
- "com.android.virt"
- ],
- "dependencies": true,
- "device": true,
- "features": "std",
- "run": true,
- "tests": true,
- "vendor-available": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..d308ca2
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,11 @@
+{
+ "apex_available": [
+ "//apex_available:platform",
+ "com.android.virt"
+ ],
+ "features": [
+ "std"
+ ],
+ "run_cargo": false,
+ "tests": true
+}