aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-20 17:39:25 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-20 17:39:25 +0000
commit778c748120ad0d3c910ecf072b22aae67c1a051a (patch)
tree76997bf0e41150dd3770d52411a947bf2d4133e6
parentd9c9674a604b494a2da4d29b0b55d525ae29da2c (diff)
parent1995e408fdd5ffb00b85d976c94825faf745c79d (diff)
downloadlibfuzzer-sys-778c748120ad0d3c910ecf072b22aae67c1a051a.tar.gz
Migrate to cargo_embargo. am: 1995e408fd
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libfuzzer-sys/+/2832653 Change-Id: I2522fd8f3e5b19694856239babaf46a2c2ecea96 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
+}