Return prefixes into filenames to avoid issues with Chromium builds.
diff --git a/examples/expat/expat_example.cc b/examples/expat/expat_example.cc
index 7c5789d..c82cb87 100644
--- a/examples/expat/expat_example.cc
+++ b/examples/expat/expat_example.cc
@@ -17,7 +17,7 @@
#include "expat.h" // NOLINT
#include "port/protobuf.h"
-#include "src/xml/mutator.h"
+#include "src/xml/xml_mutator.h"
namespace {
protobuf_mutator::protobuf::LogSilencer log_silincer;
diff --git a/examples/libfuzzer/libfuzzer_bin_example.cc b/examples/libfuzzer/libfuzzer_bin_example.cc
index 44d9fc3..060e031 100644
--- a/examples/libfuzzer/libfuzzer_bin_example.cc
+++ b/examples/libfuzzer/libfuzzer_bin_example.cc
@@ -17,7 +17,7 @@
#include "examples/libfuzzer/libfuzzer_example.pb.h"
#include "src/binary_format.h"
-#include "src/libfuzzer/mutator.h"
+#include "src/libfuzzer/libfuzzer_mutator.h"
using libfuzzer_example::Msg;
protobuf_mutator::protobuf::LogSilencer log_silincer;
diff --git a/examples/libfuzzer/libfuzzer_example.cc b/examples/libfuzzer/libfuzzer_example.cc
index 1f87222..052aed9 100644
--- a/examples/libfuzzer/libfuzzer_example.cc
+++ b/examples/libfuzzer/libfuzzer_example.cc
@@ -16,7 +16,7 @@
#include <cstdint>
#include "examples/libfuzzer/libfuzzer_example.pb.h"
-#include "src/libfuzzer/mutator.h"
+#include "src/libfuzzer/libfuzzer_mutator.h"
#include "src/text_format.h"
using libfuzzer_example::Msg;
diff --git a/examples/libxml2/libxml2_example.cc b/examples/libxml2/libxml2_example.cc
index 5bdcbbf..6da32c8 100644
--- a/examples/libxml2/libxml2_example.cc
+++ b/examples/libxml2/libxml2_example.cc
@@ -15,7 +15,7 @@
#include "libxml/parser.h"
#include "port/protobuf.h"
-#include "src/xml/mutator.h"
+#include "src/xml/xml_mutator.h"
namespace {
protobuf_mutator::protobuf::LogSilencer log_silincer;
diff --git a/src/libfuzzer/CMakeLists.txt b/src/libfuzzer/CMakeLists.txt
index 3e12557..0f13708 100644
--- a/src/libfuzzer/CMakeLists.txt
+++ b/src/libfuzzer/CMakeLists.txt
@@ -13,7 +13,7 @@
# limitations under the License.
add_library(protobuf-mutator-libfuzzer
- mutator.cc)
+ libfuzzer_mutator.cc)
target_link_libraries(protobuf-mutator-libfuzzer
protobuf-mutator
${PROTOBUF_LIBRARY})
diff --git a/src/libfuzzer/mutator.cc b/src/libfuzzer/libfuzzer_mutator.cc
similarity index 99%
rename from src/libfuzzer/mutator.cc
rename to src/libfuzzer/libfuzzer_mutator.cc
index 193c3d4..6ea06ec 100644
--- a/src/libfuzzer/mutator.cc
+++ b/src/libfuzzer/libfuzzer_mutator.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/libfuzzer/mutator.h"
+#include "src/libfuzzer/libfuzzer_mutator.h"
#include <string.h>
#include <cassert>
diff --git a/src/libfuzzer/mutator.h b/src/libfuzzer/libfuzzer_mutator.h
similarity index 96%
rename from src/libfuzzer/mutator.h
rename to src/libfuzzer/libfuzzer_mutator.h
index 8e4d59e..bdc3c80 100644
--- a/src/libfuzzer/mutator.h
+++ b/src/libfuzzer/libfuzzer_mutator.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_LIBFUZZER_MUTATOR_H_
-#define SRC_LIBFUZZER_MUTATOR_H_
+#ifndef SRC_LIBFUZZER_LIBFUZZER_MUTATOR_H_
+#define SRC_LIBFUZZER_LIBFUZZER_MUTATOR_H_
#include <string>
@@ -100,4 +100,4 @@
} // namespace libfuzzer
} // namespace protobuf_mutator
-#endif // SRC_LIBFUZZER_MUTATOR_H_
+#endif // SRC_LIBFUZZER_LIBFUZZER_MUTATOR_H_
diff --git a/src/xml/CMakeLists.txt b/src/xml/CMakeLists.txt
index 0915283..3402ec4 100644
--- a/src/xml/CMakeLists.txt
+++ b/src/xml/CMakeLists.txt
@@ -18,7 +18,7 @@
xml.proto)
add_library(protobuf-mutator-xml
- mutator.cc
+ xml_mutator.cc
xml_writer.cc
${XML_PROTO_SRCS})
target_link_libraries(protobuf-mutator-xml
diff --git a/src/xml/mutator.cc b/src/xml/xml_mutator.cc
similarity index 96%
rename from src/xml/mutator.cc
rename to src/xml/xml_mutator.cc
index 9d44dbc..0aaf9ef 100644
--- a/src/xml/mutator.cc
+++ b/src/xml/xml_mutator.cc
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/xml/mutator.h"
+#include "src/xml/xml_mutator.h"
-#include "src/libfuzzer/mutator.h"
+#include "src/libfuzzer/libfuzzer_mutator.h"
#include "src/text_format.h"
#include "src/xml/xml.pb.h"
#include "src/xml/xml_writer.h"
diff --git a/src/xml/mutator.h b/src/xml/xml_mutator.h
similarity index 94%
rename from src/xml/mutator.h
rename to src/xml/xml_mutator.h
index bd358aa..70089be 100644
--- a/src/xml/mutator.h
+++ b/src/xml/xml_mutator.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_XML_MUTATOR_H_
-#define SRC_XML_MUTATOR_H_
+#ifndef SRC_XML_XML_MUTATOR_H_
+#define SRC_XML_XML_MUTATOR_H_
#include <string>
@@ -42,4 +42,4 @@
} // namespace xml
} // namespace protobuf_mutator
-#endif // SRC_XML_MUTATOR_H_
+#endif // SRC_XML_XML_MUTATOR_H_