aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-10-18 19:48:59 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-10-18 19:48:59 +0000
commit34fe4324999ee76a2bae1c62d4f499463af3fdea (patch)
tree305484646f8121871e680ca684b53dd1e157ccfa
parent39a675f543ea8fa9e994636330a5073312b425c7 (diff)
parentbbb2775800f7b5aa80dbe666f22080b93fb363d4 (diff)
downloadlitrs-34fe4324999ee76a2bae1c62d4f499463af3fdea.tar.gz
Migrate to cargo_embargo. am: 66e61af4a9 am: bbb2775800
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/litrs/+/2796436 Change-Id: Idb564b0241574ff7e2d338242d7d2e4e5dc832a0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp6
-rw-r--r--cargo2android.json4
-rw-r--r--cargo_embargo.json9
3 files changed, 11 insertions, 8 deletions
diff --git a/Android.bp b/Android.bp
index 1cb9448..7e7c1b9 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 {
@@ -48,8 +48,6 @@ rust_library_host {
"default",
"proc-macro2",
],
- rustlibs: [
- "libproc_macro2",
- ],
+ rustlibs: ["libproc_macro2"],
compile_multilib: "first",
}
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 5d719bf..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "host-first-multilib": true,
- "run": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..c68a096
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,9 @@
+{
+ "package": {
+ "litrs": {
+ "device_supported": false,
+ "host_first_multilib": true
+ }
+ },
+ "run_cargo": false
+}