aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-14 19:44:44 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-14 19:44:44 +0000
commit5f10413b13cb22f3e9dacf855aaa187c96501571 (patch)
tree1fa441f65c917e0185ed344b31c75275efa586c2
parentc181421049fc2317f0c2d11009833bbcce9b99df (diff)
parent05b35cb48abe66fbc191ac64701ce01c6aea2b03 (diff)
downloados_str_bytes-5f10413b13cb22f3e9dacf855aaa187c96501571.tar.gz
Migrate to cargo_embargo. am: 05b35cb48aemu-34-3-release
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/os_str_bytes/+/2828069 Change-Id: I640711879ce523cbb6521fc9037263e847caf612 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp6
-rw-r--r--cargo2android.json5
-rw-r--r--cargo_embargo.json3
3 files changed, 5 insertions, 9 deletions
diff --git a/Android.bp b/Android.bp
index 0e35c4a..2cd3864 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 {
@@ -51,9 +51,7 @@ rust_library {
"memchr",
"raw_os_str",
],
- 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 ff6df50..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "device": true,
- "run": true,
- "tests": 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
+}