aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-10 06:56:46 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-10 06:56:46 +0000
commit21501261d06ee67211b5d57db5f30f326494a247 (patch)
tree7e4057970d1675e18cdb676ba75c21ae1d9c2f86
parent474cb9aab6e4ed0340f6266d65e96f99d5680af6 (diff)
parentd4ed88a3a3123f3ed643f2907adf179cc8cb5a0e (diff)
downloadlru-cache-21501261d06ee67211b5d57db5f30f326494a247.tar.gz
Migrate to cargo_embargo. am: 5c8770fe84 am: 270cab7816 am: d4ed88a3a3
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/lru-cache/+/2821937 Change-Id: I3edb1857b63e8a1858c5be433b16c101da748507 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp10
-rw-r--r--cargo2android.json5
-rw-r--r--cargo_embargo.json4
3 files changed, 7 insertions, 12 deletions
diff --git a/Android.bp b/Android.bp
index 6dbf830..7937a8e 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 {
@@ -45,9 +45,7 @@ rust_library {
cargo_pkg_version: "0.1.2",
srcs: ["src/lib.rs"],
edition: "2015",
- rustlibs: [
- "liblinked_hash_map",
- ],
+ rustlibs: ["liblinked_hash_map"],
apex_available: [
"//apex_available:platform",
"//apex_available:anyapex",
@@ -69,7 +67,5 @@ rust_test {
unit_test: true,
},
edition: "2015",
- rustlibs: [
- "liblinked_hash_map",
- ],
+ rustlibs: ["liblinked_hash_map"],
}
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index d36fb44..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "device": true,
- "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..c8842d1
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,4 @@
+{
+ "run_cargo": false,
+ "tests": true
+}