Merge "Delete //tools/security/fuzzing/fuzz."
diff --git a/OWNERS b/OWNERS
index ab8a4e4..96f0a09 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,5 +1,14 @@
-# Default code reviewers picked from top 3 or more developers.
-# Please update this list if you find better candidates.
-riggle@google.com
+# Code owners for various security-related things on Android.
+
+# Sanitizers
+mitchp@google.com
+eugenis@google.com
+
+# Haiku members (fuzzing-on-Android)
+hamzeh@google.com
+ispo@google.com
+kalder@google.com
+
+# ASA
 olorin@google.com
 danielaustin@google.com
diff --git a/example_fuzzer/Android.bp b/fuzzing/example_fuzzer/Android.bp
similarity index 100%
rename from example_fuzzer/Android.bp
rename to fuzzing/example_fuzzer/Android.bp
diff --git a/example_fuzzer/README.md b/fuzzing/example_fuzzer/README.md
similarity index 100%
rename from example_fuzzer/README.md
rename to fuzzing/example_fuzzer/README.md
diff --git a/example_fuzzer/corpus/8f9f618d47e1546e24e47eb9cf9160c2b5488306 b/fuzzing/example_fuzzer/corpus/8f9f618d47e1546e24e47eb9cf9160c2b5488306
similarity index 100%
rename from example_fuzzer/corpus/8f9f618d47e1546e24e47eb9cf9160c2b5488306
rename to fuzzing/example_fuzzer/corpus/8f9f618d47e1546e24e47eb9cf9160c2b5488306
Binary files differ
diff --git a/example_fuzzer/corpus/902d246adaa6f7d743643c751884ea1d912b4950 b/fuzzing/example_fuzzer/corpus/902d246adaa6f7d743643c751884ea1d912b4950
similarity index 100%
rename from example_fuzzer/corpus/902d246adaa6f7d743643c751884ea1d912b4950
rename to fuzzing/example_fuzzer/corpus/902d246adaa6f7d743643c751884ea1d912b4950
diff --git a/example_fuzzer/corpus/95e3b6e7c3b8a064b2ea6cf3ea31dcbb30a1fb18 b/fuzzing/example_fuzzer/corpus/95e3b6e7c3b8a064b2ea6cf3ea31dcbb30a1fb18
similarity index 100%
rename from example_fuzzer/corpus/95e3b6e7c3b8a064b2ea6cf3ea31dcbb30a1fb18
rename to fuzzing/example_fuzzer/corpus/95e3b6e7c3b8a064b2ea6cf3ea31dcbb30a1fb18
diff --git a/example_fuzzer/corpus/bc90c2fcdc92dc9a8a791800b52027f7482eea44 b/fuzzing/example_fuzzer/corpus/bc90c2fcdc92dc9a8a791800b52027f7482eea44
similarity index 100%
rename from example_fuzzer/corpus/bc90c2fcdc92dc9a8a791800b52027f7482eea44
rename to fuzzing/example_fuzzer/corpus/bc90c2fcdc92dc9a8a791800b52027f7482eea44
diff --git a/example_fuzzer/corpus/c0a0ad26a634840c67a210fefdda76577b03a111 b/fuzzing/example_fuzzer/corpus/c0a0ad26a634840c67a210fefdda76577b03a111
similarity index 100%
rename from example_fuzzer/corpus/c0a0ad26a634840c67a210fefdda76577b03a111
rename to fuzzing/example_fuzzer/corpus/c0a0ad26a634840c67a210fefdda76577b03a111
diff --git a/example_fuzzer/corpus/c4ea21bb365bbeeaf5f2c654883e56d11e43c44e b/fuzzing/example_fuzzer/corpus/c4ea21bb365bbeeaf5f2c654883e56d11e43c44e
similarity index 100%
rename from example_fuzzer/corpus/c4ea21bb365bbeeaf5f2c654883e56d11e43c44e
rename to fuzzing/example_fuzzer/corpus/c4ea21bb365bbeeaf5f2c654883e56d11e43c44e
diff --git a/example_fuzzer/corpus/c586fc26e9f2e97ffd7df1e780ef5782ad0a40bc b/fuzzing/example_fuzzer/corpus/c586fc26e9f2e97ffd7df1e780ef5782ad0a40bc
similarity index 100%
rename from example_fuzzer/corpus/c586fc26e9f2e97ffd7df1e780ef5782ad0a40bc
rename to fuzzing/example_fuzzer/corpus/c586fc26e9f2e97ffd7df1e780ef5782ad0a40bc
diff --git a/example_fuzzer/corpus/d78c4164b4f861fb55bc47e15a623b2fa49a69a8 b/fuzzing/example_fuzzer/corpus/d78c4164b4f861fb55bc47e15a623b2fa49a69a8
similarity index 100%
rename from example_fuzzer/corpus/d78c4164b4f861fb55bc47e15a623b2fa49a69a8
rename to fuzzing/example_fuzzer/corpus/d78c4164b4f861fb55bc47e15a623b2fa49a69a8
diff --git a/example_fuzzer/example_fuzzer.cpp b/fuzzing/example_fuzzer/example_fuzzer.cpp
similarity index 100%
rename from example_fuzzer/example_fuzzer.cpp
rename to fuzzing/example_fuzzer/example_fuzzer.cpp
diff --git a/example_fuzzer/example_fuzzer.dict b/fuzzing/example_fuzzer/example_fuzzer.dict
similarity index 100%
rename from example_fuzzer/example_fuzzer.dict
rename to fuzzing/example_fuzzer/example_fuzzer.dict