aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-13 17:17:27 +0000
committerAndrew Walbran <qwandor@google.com>2023-11-13 17:17:27 +0000
commite24e2e4e2ecba7605c9f60bc4b2daf96080185af (patch)
tree77d115c8b1f0e01e5e061bd56a405b04efdf12d0
parentc0e4d289700a5c1378b345adbbeee4934d884352 (diff)
downloadsmccc-e24e2e4e2ecba7605c9f60bc4b2daf96080185af.tar.gz
Migrate to cargo_embargo.
Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: Ie914e9164bd46a85d2e326c66c0fcc1705f51d58
-rw-r--r--Android.bp4
-rw-r--r--cargo2android.json9
-rw-r--r--cargo_embargo.json11
3 files changed, 12 insertions, 12 deletions
diff --git a/Android.bp b/Android.bp
index 3ac933a..e94e37c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,8 +1,6 @@
-// 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.
-
-
rust_library_rlib {
name: "libsmccc",
crate_name: "smccc",
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index c78127b..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "dependencies": true,
- "device": true,
- "force-rlib": true,
- "no-host": true,
- "no-std": true,
- "run": true,
- "tests": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..e3c9cb8
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,11 @@
+{
+ "package": {
+ "smccc": {
+ "force_rlib": true,
+ "host_supported": false,
+ "no_std": true
+ }
+ },
+ "run_cargo": false,
+ "tests": true
+}