aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-16 18:57:26 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-16 18:57:26 +0000
commitd6aaa6bd86684964c0525d421fa5351141befb0b (patch)
tree1da732f8fffff48dd291af9741c70fa368a6e2ef
parent09bb49771da981ab02ed2eb607bb461ea3b12175 (diff)
parent99ac0512be134cdb0cbd20f7f0e800d41152cb53 (diff)
downloadnum-traits-d6aaa6bd86684964c0525d421fa5351141befb0b.tar.gz
Migrate to cargo_embargo. am: bcd78885ee am: 99ac0512be
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/num-traits/+/2832424 Change-Id: Ieecc479f63fc43cf124f2875e3e0cc4b0b326c96 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp6
-rw-r--r--cargo2android.json15
-rw-r--r--cargo_embargo.json11
3 files changed, 13 insertions, 19 deletions
diff --git a/Android.bp b/Android.bp
index 09b8faf..f6a93ca 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 {
@@ -127,7 +127,5 @@ rust_test {
"has_reverse_bits",
"has_to_int_unchecked",
],
- rustlibs: [
- "libnum_traits",
- ],
+ rustlibs: ["libnum_traits"],
}
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 3a110a3..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "apex-available": [
- "//apex_available:platform",
- "com.android.btservices",
- "com.android.compos",
- "com.android.uwb",
- "com.android.virt"
- ],
- "dependencies": true,
- "device": true,
- "min-sdk-version": "29",
- "run": true,
- "tests": true,
- "vendor-available": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..1e1f4d3
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,11 @@
+{
+ "apex_available": [
+ "//apex_available:platform",
+ "com.android.btservices",
+ "com.android.compos",
+ "com.android.uwb",
+ "com.android.virt"
+ ],
+ "min_sdk_version": "29",
+ "tests": true
+}