aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-20 16:45:39 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-20 16:45:39 +0000
commit1f9dad4e27fb9b053b9502c91530bdd007d1c2cd (patch)
treea08b868f77a3c24aeab3777c24186bd6fe990cfc
parent7d26f50aa3e38498d2e8fc892801bb1baa6432b4 (diff)
parentdf6ebc77f7753a36ce534aaa5db945f9e073bc38 (diff)
downloaddocument-features-1f9dad4e27fb9b053b9502c91530bdd007d1c2cd.tar.gz
Migrate to cargo_embargo. am: efe366f7f8 am: 714b322ba4 am: df6ebc77f7
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/document-features/+/2832654 Change-Id: I8c7889d60d9a02e0eb1c12a1d01d2d740662d6fb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp6
-rw-r--r--cargo2android.json3
-rw-r--r--cargo_embargo.json8
3 files changed, 10 insertions, 7 deletions
diff --git a/Android.bp b/Android.bp
index c5a14fd..05a67ac 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 {
@@ -47,7 +47,5 @@ rust_proc_macro {
srcs: ["lib.rs"],
edition: "2018",
features: ["default"],
- rustlibs: [
- "liblitrs",
- ],
+ rustlibs: ["liblitrs"],
}
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 1d33ddd..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "run": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..0c167f3
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,8 @@
+{
+ "package": {
+ "document-features": {
+ "device_supported": false
+ }
+ },
+ "run_cargo": false
+}