From 6fd997b710e96e0c66d6dcd2e1c5cfd950d6accd Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Thu, 18 Jun 2015 17:51:37 -0700 Subject: Merge to XFA: Move libopenjpeg to third_party/ Original Review URL: https://codereview.chromium.org/1185373010. TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1193773002. --- third_party/BUILD.gn | 43 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 36 insertions(+), 7 deletions(-) (limited to 'third_party/BUILD.gn') diff --git a/third_party/BUILD.gn b/third_party/BUILD.gn index c1c63db6b9..c988e7d8b0 100644 --- a/third_party/BUILD.gn +++ b/third_party/BUILD.gn @@ -13,8 +13,8 @@ group("third_party") { static_library("bigint") { configs -= [ "//build/config/compiler:chromium_code" ] configs += [ - "//third_party/pdfium:pdfium_config", - "//build/config/compiler:no_chromium_code", + "//build/config/compiler:no_chromium_code", + "//third_party/pdfium:pdfium_config", ] sources = [ "bigint/BigInteger.hh", @@ -33,8 +33,8 @@ static_library("bigint") { source_set("freetype") { configs -= [ "//build/config/compiler:chromium_code" ] configs += [ - "//third_party/pdfium:pdfium_config", - "//build/config/compiler:no_chromium_code", + "//build/config/compiler:no_chromium_code", + "//third_party/pdfium:pdfium_config", ] defines = [ "FT2_BUILD_LIBRARY" ] sources = [ @@ -196,11 +196,40 @@ source_set("fx_libjpeg") { ] } -component("pdfium_base") { +source_set("fx_libopenjpeg") { configs -= [ "//build/config/compiler:chromium_code" ] configs += [ - "//third_party/pdfium:pdfium_config", - "//build/config/compiler:no_chromium_code", + "//build/config/compiler:no_chromium_code", + "//third_party/pdfium:pdfium_config", + ] + sources = [ + "libopenjpeg20/bio.c", + "libopenjpeg20/cio.c", + "libopenjpeg20/dwt.c", + "libopenjpeg20/event.c", + "libopenjpeg20/function_list.c", + "libopenjpeg20/image.c", + "libopenjpeg20/invert.c", + "libopenjpeg20/j2k.c", + "libopenjpeg20/jp2.c", + "libopenjpeg20/mct.c", + "libopenjpeg20/mqc.c", + "libopenjpeg20/openjpeg.c", + "libopenjpeg20/opj_clock.c", + "libopenjpeg20/pi.c", + "libopenjpeg20/raw.c", + "libopenjpeg20/t1.c", + "libopenjpeg20/t2.c", + "libopenjpeg20/tcd.c", + "libopenjpeg20/tgt.c", + ] +} + +source_set("pdfium_base") { + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ + "//build/config/compiler:no_chromium_code", + "//third_party/pdfium:pdfium_config", ] sources = [ "base/logging.h", -- cgit v1.2.3