Chromium Code Reviews| Index: BUILD.gn |
| diff --git a/BUILD.gn b/BUILD.gn |
| index b8ae1a16600fdf73b207c846af74222e52976437..a0791fb114e122f6b0a8a36c69fe834c96ea5a32 100644 |
| --- a/BUILD.gn |
| +++ b/BUILD.gn |
| @@ -775,6 +775,7 @@ test("pdfium_embeddertests") { |
| "core/src/fpdfapi/fpdf_page/fpdf_page_func_embeddertest.cpp", |
| "core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp", |
| "core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_embeddertest.cpp", |
| + "core/src/fpdfapi/fpdf_render/fpdf_render_loadimage_embeddertest.cpp", |
|
Oliver Chang
2015/11/13 17:24:03
++<<<<<<< HEAD
++=======
+ "core/src/fpdfapi/f
|
| "fpdfsdk/src/fpdf_dataavail_embeddertest.cpp", |
| "fpdfsdk/src/fpdfdoc_embeddertest.cpp", |
| "fpdfsdk/src/fpdfformfill_embeddertest.cpp", |