Be consistent with the includes in non-src folders.

BUG: 470992419

Change-Id: I55618205da7dcfe17d96a7c3ee69d924a63d1acf

tests/fuzzer/CMakeLists.txt

@@ -47,6 +47,8 @@ fuzztest_setup_fuzzing_flags()
 add_library(fuzz_utils fuzz_utils.h fuzz_utils.cc img_alpha.h img_grid.h
                        img_peak.h)
 target_link_libraries(fuzz_utils PUBLIC webpdecoder)
+target_include_directories(fuzz_utils PUBLIC ${CMAKE_SOURCE_DIR}
+                                             ${CMAKE_BINARY_DIR})
 link_fuzztest(fuzz_utils)
 
 add_webp_fuzztest(advanced_api_fuzzer webpdecode webpdspdecode webputilsdecode)

tests/fuzzer/advanced_api_fuzzer.cc

@@ -23,7 +23,7 @@
 #include "./fuzz_utils.h"
 #include "src/dec/webpi_dec.h"
 #include "src/utils/rescaler_utils.h"
-#include "src/webp/decode.h"
+#include "webp/decode.h"
 
 namespace {
 

tests/fuzzer/animation_api_fuzzer.cc

@@ -19,9 +19,9 @@
 #include <string_view>
 
 #include "./fuzz_utils.h"
-#include "src/webp/decode.h"
-#include "src/webp/demux.h"
-#include "src/webp/mux_types.h"
+#include "webp/decode.h"
+#include "webp/demux.h"
+#include "webp/mux_types.h"
 
 namespace {
 

tests/fuzzer/animdecoder_fuzzer.cc

@@ -21,9 +21,9 @@
 #include "./fuzz_utils.h"
 #include "./nalloc.h"
 #include "imageio/imageio_util.h"
-#include "src/webp/decode.h"
-#include "src/webp/demux.h"
-#include "src/webp/mux_types.h"
+#include "webp/decode.h"
+#include "webp/demux.h"
+#include "webp/mux_types.h"
 
 namespace {
 

tests/fuzzer/animencoder_fuzzer.cc

@@ -22,9 +22,9 @@
 
 #include "./fuzz_utils.h"
 #include "src/dsp/cpu.h"
-#include "src/webp/encode.h"
-#include "src/webp/mux.h"
-#include "src/webp/mux_types.h"
+#include "webp/encode.h"
+#include "webp/mux.h"
+#include "webp/mux_types.h"
 
 namespace {
 

tests/fuzzer/dec_fuzzer.cc

@@ -21,8 +21,8 @@
 #include <string_view>
 
 #include "./nalloc.h"
-#include "src/webp/decode.h"
 #include "tests/fuzzer/fuzz_utils.h"
+#include "webp/decode.h"
 
 namespace {
 

tests/fuzzer/enc_dec_fuzzer.cc

@@ -24,8 +24,8 @@
 #include "./fuzz_utils.h"
 #include "src/dsp/cpu.h"
 #include "src/utils/rescaler_utils.h"
-#include "src/webp/decode.h"
-#include "src/webp/encode.h"
+#include "webp/decode.h"
+#include "webp/encode.h"
 
 namespace {
 

tests/fuzzer/enc_fuzzer.cc

@@ -24,10 +24,10 @@
 
 #include "imageio/image_dec.h"
 #include "src/dsp/cpu.h"
-#include "src/webp/decode.h"
-#include "src/webp/encode.h"
-#include "src/webp/types.h"
 #include "tests/fuzzer/fuzz_utils.h"
+#include "webp/decode.h"
+#include "webp/encode.h"
+#include "webp/types.h"
 
 namespace {
 

tests/fuzzer/fuzz_utils.cc

@@ -30,9 +30,9 @@
 #include "./img_grid.h"
 #include "./img_peak.h"
 #include "src/dsp/cpu.h"
-#include "src/webp/decode.h"
-#include "src/webp/encode.h"
-#include "src/webp/types.h"
+#include "webp/decode.h"
+#include "webp/encode.h"
+#include "webp/types.h"
 
 namespace fuzz_utils {
 

tests/fuzzer/huffman_fuzzer.cc

@@ -24,7 +24,7 @@
 #include "src/utils/bit_reader_utils.h"
 #include "src/utils/huffman_utils.h"
 #include "src/utils/utils.h"
-#include "src/webp/format_constants.h"
+#include "webp/format_constants.h"
 
 namespace {
 

tests/fuzzer/mux_demux_api_fuzzer.cc

@@ -19,9 +19,9 @@
 #include <string_view>
 
 #include "./fuzz_utils.h"
-#include "src/webp/demux.h"
-#include "src/webp/mux.h"
-#include "src/webp/mux_types.h"
+#include "webp/demux.h"
+#include "webp/mux.h"
+#include "webp/mux_types.h"
 
 namespace {
 

tests/fuzzer/simple_api_fuzzer.cc

@@ -20,8 +20,8 @@
 #include <string_view>
 
 #include "./fuzz_utils.h"
-#include "src/webp/decode.h"
-#include "src/webp/types.h"
+#include "webp/decode.h"
+#include "webp/types.h"
 
 namespace {
 

tests/fuzzer/webp_info_fuzzer.cc

@@ -18,8 +18,8 @@
 #include <string_view>
 
 #include "./nalloc.h"
-#include "src/webp/mux_types.h"
 #include "tests/fuzzer/fuzz_utils.h"
+#include "webp/mux_types.h"
 
 // Don't do that at home!
 #define main exec_main