aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-09 13:45:15 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-09 13:45:15 +0000
commit867fa8abfb6a5bf104e75a476117345275248486 (patch)
tree0526d3701991dddde3f39da6dc4fedb5e532af42
parent19fd99c5f74396c9401b5e13dadb1440d064eec1 (diff)
parent25ae9e30f009003cc397cc618667902f6ac47c1b (diff)
downloadfxhash-867fa8abfb6a5bf104e75a476117345275248486.tar.gz
Migrate to cargo_embargo. am: 25ae9e30f0
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fxhash/+/2822241 Change-Id: Ic43c0700e3a65e5b10a68188028c1385e3b2c4ed Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp7
-rw-r--r--cargo2android.json5
-rw-r--r--cargo_embargo.json3
3 files changed, 5 insertions, 10 deletions
diff --git a/Android.bp b/Android.bp
index c528e9f..cb2063b 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 {
@@ -39,16 +39,13 @@ license {
rust_library {
name: "libfxhash",
- // has rustc warnings
host_supported: true,
crate_name: "fxhash",
cargo_env_compat: true,
cargo_pkg_version: "0.2.1",
srcs: ["lib.rs"],
edition: "2015",
- rustlibs: [
- "libbyteorder",
- ],
+ rustlibs: ["libbyteorder"],
apex_available: [
"//apex_available:platform",
"//apex_available:anyapex",
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 31338da..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "run": true,
- "device": true,
- "dependencies": true
-}
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
+}