aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-10-18 18:20:06 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-10-18 18:20:06 +0000
commit8dedee11bb1cdecd375d064faf08787d50984920 (patch)
treeb10334d4b769ee60b4894388d82ac806a6c5b885
parenta470db8acae359d4ed7ad3027cd4d29b6a70217f (diff)
parentf9ae05a559e9d484fe0826522c933ab0ff8f2db6 (diff)
downloadcsv-core-8dedee11bb1cdecd375d064faf08787d50984920.tar.gz
Migrate to cargo_embargo. am: 710d171c58 am: f9ae05a559
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/csv-core/+/2796180 Change-Id: I28f3925372052e55e21703c2a0a1d4fc9d8bb2dd 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 b9c70cf..5f6ea53 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 {
@@ -47,9 +47,7 @@ rust_library {
srcs: ["src/lib.rs"],
edition: "2018",
features: ["default"],
- rustlibs: [
- "libmemchr",
- ],
+ rustlibs: ["libmemchr"],
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
+}