From fe85afa303449e70a607bbf8458bd816725e25d2 Mon Sep 17 00:00:00 2001
From: Tom Sepez <tsepez@chromium.org>
Date: Wed, 17 Jun 2015 17:30:47 -0700
Subject: Revert "Move libopenjpeg to third_party/"

This reverts commit c7a17bf9cdb0d646aa8b653e6ab2678a1837ed6a.
---
 third_party/BUILD.gn | 36 +++---------------------------------
 1 file changed, 3 insertions(+), 33 deletions(-)

(limited to 'third_party/BUILD.gn')

diff --git a/third_party/BUILD.gn b/third_party/BUILD.gn
index 666afe557d..11da543683 100644
--- a/third_party/BUILD.gn
+++ b/third_party/BUILD.gn
@@ -13,8 +13,8 @@ group("third_party") {
 source_set("bigint") {
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [
-    "//build/config/compiler:no_chromium_code",
     "//third_party/pdfium:pdfium_config",
+    "//build/config/compiler:no_chromium_code",
   ]
   sources = [
     "bigint/BigInteger.cc",
@@ -33,8 +33,8 @@ source_set("bigint") {
 source_set("freetype") {
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [
-    "//build/config/compiler:no_chromium_code",
     "//third_party/pdfium:pdfium_config",
+    "//build/config/compiler:no_chromium_code",
   ]
   defines = [ "FT2_BUILD_LIBRARY" ]
   sources = [
@@ -196,41 +196,11 @@ source_set("fx_libjpeg") {
   ]
 }
 
-source_set("fx_libopenjpeg") {
-  configs -= [ "//build/config/compiler:chromium_code" ]
-  configs += [
-    "//build/config/compiler:no_chromium_code",
-    "//third_party/pdfium:pdfium_config",
-  ]
-  defines = [ "_CRT_SECURE_NO_WARNINGS" ]
-  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",
+    "//build/config/compiler:no_chromium_code",
   ]
   sources = [
     "base/logging.h",
-- 
cgit v1.2.3