Fix missing headers in libwebp

third_party/libwebp/BUILD.gn

Index: third_party/libwebp/BUILD.gn
diff --git a/third_party/libwebp/BUILD.gn b/third_party/libwebp/BUILD.gn
index 470bd2926c6d07a38dd7d0f26ad9a31b06453063..a523f38b69fe7137c2e1ef7c98fc7abacfdf5062 100644
--- a/third_party/libwebp/BUILD.gn
+++ b/third_party/libwebp/BUILD.gn
@@ -16,18 +16,33 @@ use_dsp_neon =
     current_cpu == "arm64" || (current_cpu == "arm" && arm_version >= 7 &&
                                (arm_use_neon || arm_optionally_use_neon))
 
+source_set("libwebp_headers") {
+  sources = [
+    "webp/format_constants.h",
+    "webp/mux_types.h",
+    "webp/types.h",

[Nico, 2017/05/01 13:29:41]

This target feels kind of strange to me: Everythinn except libweb_utils depends
on this, so maybe these should just be in libwebp_utils. But then, the way this
file seems to be organized is that every target only has files from one folder,
so maybe this target should be called libwebp_webp and also include
webp/decode.h, webp/demux.h, webp/encode.h. The latter is probably most
consistent with the existing file if it works.

[wychen, 2017/05/01 18:26:06]

That was what I did in ps1.

The reason I moved decode/demux/encode.h to separate targets is that
components/image_fetcher/ios/webp_decoder.h includes decode.h, while its deps
only has libwebp:libwebp_dec.

I guess adding libwebp_headers to its deps makes more sense.

+  ]
+}
+
 static_library("libwebp_dec") {
   sources = [
     "dec/alpha_dec.c",
+    "dec/alphai_dec.h",
     "dec/buffer_dec.c",
+    "dec/common_dec.h",
     "dec/frame_dec.c",
     "dec/idec_dec.c",
     "dec/io_dec.c",
     "dec/quant_dec.c",
     "dec/tree_dec.c",
     "dec/vp8_dec.c",
+    "dec/vp8_dec.h",
+    "dec/vp8i_dec.h",
     "dec/vp8l_dec.c",
+    "dec/vp8li_dec.h",
     "dec/webp_dec.c",
+    "dec/webpi_dec.h",
+    "webp/decode.h",
   ]
 
   configs -= [ "//build/config/compiler:chromium_code" ]
@@ -39,6 +54,7 @@ static_library("libwebp_dec") {
 
   deps = [
     ":libwebp_dsp",
+    ":libwebp_headers",
     ":libwebp_utils",
   ]
   all_dependent_configs = [ ":libwebp_config" ]
@@ -50,11 +66,13 @@ static_library("libwebp_dec") {
 static_library("libwebp_demux") {
   sources = [
     "demux/demux.c",
+    "webp/demux.h",
   ]
   all_dependent_configs = [ ":libwebp_config" ]
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [ "//build/config/compiler:no_chromium_code" ]
   deps = [
+    ":libwebp_headers",
     ":libwebp_utils",
   ]
 }
@@ -65,6 +83,7 @@ static_library("libwebp_dsp") {
     "dsp/alpha_processing_mips_dsp_r2.c",
     "dsp/argb.c",
     "dsp/argb_mips_dsp_r2.c",
+    "dsp/common_sse2.h",
     "dsp/cost.c",
     "dsp/cost_mips32.c",
     "dsp/cost_mips_dsp_r2.c",
@@ -74,6 +93,7 @@ static_library("libwebp_dsp") {
     "dsp/dec_mips32.c",
     "dsp/dec_mips_dsp_r2.c",
     "dsp/dec_msa.c",
+    "dsp/dsp.h",
     "dsp/enc.c",
     "dsp/enc_avx2.c",
     "dsp/enc_mips32.c",
@@ -83,12 +103,15 @@ static_library("libwebp_dsp") {
     "dsp/filters_mips_dsp_r2.c",
     "dsp/filters_msa.c",
     "dsp/lossless.c",
+    "dsp/lossless.h",
+    "dsp/lossless_common.h",
     "dsp/lossless_enc.c",
     "dsp/lossless_enc_mips32.c",
     "dsp/lossless_enc_mips_dsp_r2.c",
     "dsp/lossless_enc_msa.c",
     "dsp/lossless_mips_dsp_r2.c",
     "dsp/lossless_msa.c",
+    "dsp/neon.h",
     "dsp/rescaler.c",
     "dsp/rescaler_mips32.c",
     "dsp/rescaler_mips_dsp_r2.c",
@@ -97,6 +120,7 @@ static_library("libwebp_dsp") {
     "dsp/upsampling_mips_dsp_r2.c",
     "dsp/upsampling_msa.c",
     "dsp/yuv.c",
+    "dsp/yuv.h",
     "dsp/yuv_mips32.c",
     "dsp/yuv_mips_dsp_r2.c",
   ]
@@ -111,6 +135,7 @@ static_library("libwebp_dsp") {
   deps = [
     ":libwebp_dsp_sse2",
     ":libwebp_dsp_sse41",
+    ":libwebp_headers",
     ":libwebp_utils",
   ]
   if (is_android) {
@@ -221,12 +246,16 @@ static_library("libwebp_enc") {
     "enc/alpha_enc.c",
     "enc/analysis_enc.c",
     "enc/backward_references_enc.c",
+    "enc/backward_references_enc.h",
     "enc/config_enc.c",
     "enc/cost_enc.c",
+    "enc/cost_enc.h",
     "enc/delta_palettization_enc.c",
+    "enc/delta_palettization_enc.h",
     "enc/filter_enc.c",
     "enc/frame_enc.c",
     "enc/histogram_enc.c",
+    "enc/histogram_enc.h",
     "enc/iterator_enc.c",
     "enc/near_lossless_enc.c",
     "enc/picture_csp_enc.c",
@@ -239,8 +268,11 @@ static_library("libwebp_enc") {
     "enc/syntax_enc.c",
     "enc/token_enc.c",
     "enc/tree_enc.c",
+    "enc/vp8i_enc.h",
     "enc/vp8l_enc.c",
+    "enc/vp8li_enc.h",
     "enc/webp_enc.c",
+    "webp/encode.h",
   ]
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -252,6 +284,7 @@ static_library("libwebp_enc") {
   all_dependent_configs = [ ":libwebp_config" ]
 
   deps = [
+    ":libwebp_headers",
     ":libwebp_utils",
   ]
 }
@@ -265,18 +298,32 @@ config("libwebp_utils_warnings") {
 
 static_library("libwebp_utils") {
   sources = [
+    "utils/bit_reader_inl_utils.h",
     "utils/bit_reader_utils.c",
+    "utils/bit_reader_utils.h",
     "utils/bit_writer_utils.c",
+    "utils/bit_writer_utils.h",
     "utils/color_cache_utils.c",
+    "utils/color_cache_utils.h",
+    "utils/endian_inl_utils.h",
     "utils/filters_utils.c",
+    "utils/filters_utils.h",
     "utils/huffman_encode_utils.c",
+    "utils/huffman_encode_utils.h",
     "utils/huffman_utils.c",
+    "utils/huffman_utils.h",
     "utils/quant_levels_dec_utils.c",
+    "utils/quant_levels_dec_utils.h",
     "utils/quant_levels_utils.c",
+    "utils/quant_levels_utils.h",
     "utils/random_utils.c",
+    "utils/random_utils.h",
     "utils/rescaler_utils.c",
+    "utils/rescaler_utils.h",
     "utils/thread_utils.c",
+    "utils/thread_utils.h",
     "utils/utils.c",
+    "utils/utils.h",
   ]
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [ "//build/config/compiler:no_chromium_code" ]