aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-10-19 08:28:13 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-10-19 08:28:13 +0000
commit7b6e9d6d95831cba3700dac93111f35a2e8a1963 (patch)
treef8f58424db661a4c7ad7cefdadcd6feb862a000c
parentdb5b2e8fed652070621ed695226a97c7174ce66e (diff)
parent0a6a846d0f49c6faadffd55364d2abb4307e71fc (diff)
downloadlibm-7b6e9d6d95831cba3700dac93111f35a2e8a1963.tar.gz
Migrate to cargo_embargo. am: fea7a2a378 am: 6ff6095ea8 am: 0a6a846d0f
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libm/+/2796294 Change-Id: I995d111a486a421b0486166a795e4416ebe7eb32 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp2
-rw-r--r--cargo2android.json11
-rw-r--r--cargo_embargo.json9
3 files changed, 10 insertions, 12 deletions
diff --git a/Android.bp b/Android.bp
index a4be06b..b34acc5 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 911c36f..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "apex-available": [
- "//apex_available:platform",
- "com.android.resolv"
- ],
- "dependencies": true,
- "device": true,
- "min-sdk-version": "29",
- "run": true,
- "tests": true
-} \ No newline at end of file
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..bc550b9
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,9 @@
+{
+ "tests": true,
+ "apex_available": [
+ "//apex_available:platform",
+ "com.android.resolv"
+ ],
+ "min_sdk_version": "29",
+ "run_cargo": false
+}