aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-20 18:24:40 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-20 18:24:40 +0000
commitec155a672f6372afb62b497db250628d941397af (patch)
tree76997bf0e41150dd3770d52411a947bf2d4133e6
parenta26fa2394888a1c4d1dcc1ca2acf0af1e8e222fa (diff)
parent74bf7ac500a8d4ec53262f471721f51530a5a2d0 (diff)
downloadlibfuzzer-sys-ec155a672f6372afb62b497db250628d941397af.tar.gz
Migrate to cargo_embargo. am: 1995e408fd am: 74bf7ac500
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libfuzzer-sys/+/2832653 Change-Id: I7503cb622991d3161f11baf8a9f68b2f666cd034 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp2
-rw-r--r--cargo2android.json11
-rw-r--r--cargo_embargo.json15
3 files changed, 16 insertions, 12 deletions
diff --git a/Android.bp b/Android.bp
index 5049fb7..335a89e 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 {
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 01e723e..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "dependencies": true,
- "device": true,
- "features": "arbitrary-derive",
- "force-rlib": true,
- "lib-blocklist": [
- "fuzzer",
- "stdc++"
- ],
- "run": true
-} \ No newline at end of file
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..1369b28
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,15 @@
+{
+ "features": [
+ "arbitrary-derive"
+ ],
+ "package": {
+ "libfuzzer-sys": {
+ "dep_blocklist": [
+ "libfuzzer",
+ "libstdc++"
+ ],
+ "force_rlib": true
+ }
+ },
+ "run_cargo": false
+}