aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-20 18:39:32 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-20 18:39:32 +0000
commit5ab8ba841a1b78f8f20d6509f403338c000d6e84 (patch)
tree8a2f8ca02a855a7e6380a49522514fc34d302757
parentd41aecf6d3e56ebc44ff9ddd623dbd9be691d589 (diff)
parent4d171391fd74636f61321bf54f9d380a7ffcf652 (diff)
downloadatty-5ab8ba841a1b78f8f20d6509f403338c000d6e84.tar.gz
Migrate to cargo_embargo. am: 7dd75b637c am: b8ca05e687 am: 4d171391fd
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/atty/+/2838078 Change-Id: I391108474543d08dd3d544d0da3e6bd29ebc53f0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp6
-rw-r--r--cargo2android.json4
-rw-r--r--cargo_embargo.json3
3 files changed, 5 insertions, 8 deletions
diff --git a/Android.bp b/Android.bp
index 8e8a16f..1d55b2f 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 {
@@ -26,9 +26,7 @@ rust_library {
cargo_pkg_version: "0.2.14",
srcs: ["src/lib.rs"],
edition: "2015",
- rustlibs: [
- "liblibc",
- ],
+ rustlibs: ["liblibc"],
apex_available: [
"//apex_available:platform",
"//apex_available:anyapex",
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index bf78496..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "device": true,
- "run": true
-} \ No newline at end of file
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..cb908d7
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,3 @@
+{
+ "run_cargo": false
+}