aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-14 20:41:36 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-14 20:41:36 +0000
commit22442215148f08dabed08b0de06583a4dbd878b8 (patch)
tree4bcde455b603bde9fba19243b32c46ac266228d3
parent505c62ad1a8e4ef07531e83ccc23831b629ca70b (diff)
parentf73ae172d996ed148ec8fbed5eb88d7e40ed8f04 (diff)
downloadlibc-22442215148f08dabed08b0de06583a4dbd878b8.tar.gz
Migrate to cargo_embargo. am: f73ae172d9
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libc/+/2828241 Change-Id: I5b1648d9299bd81a8e879a758e8aab615c12c3ff Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp2
-rw-r--r--cargo2android.json14
-rw-r--r--cargo_embargo.json9
3 files changed, 10 insertions, 15 deletions
diff --git a/Android.bp b/Android.bp
index 16390d5a..049a22dd 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 {
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 7572bb6b..00000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "apex-available": [
- "//apex_available:platform",
- "//apex_available:anyapex"
- ],
- "dependencies": true,
- "device": true,
- "features": "default,extra_traits,std",
- "min-sdk-version": "29",
- "product-available": true,
- "run": true,
- "tests": true,
- "vendor-available": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 00000000..fde4fff2
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,9 @@
+{
+ "features": [
+ "default",
+ "extra_traits",
+ "std"
+ ],
+ "min_sdk_version": "29",
+ "tests": true
+}