aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-16 14:21:07 +0000
committerAndrew Walbran <qwandor@google.com>2023-11-16 14:21:07 +0000
commitbcd78885eec1f2bfb88fe68a0cfe64802b8904e2 (patch)
tree1da732f8fffff48dd291af9741c70fa368a6e2ef
parentc7af2fd25eb90b563676db422fb089ef43a8bedc (diff)
downloadnum-traits-bcd78885eec1f2bfb88fe68a0cfe64802b8904e2.tar.gz
Migrate to cargo_embargo.
Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: Id13d82f29ff36c3c373bb936761a9cae571f40aa
-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
+}