summaryrefslogtreecommitdiffstats
path: root/third_party/brotli
diff options
context:
space:
mode:
authorbashi@chromium.org <bashi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-06 00:08:32 +0000
committerbashi@chromium.org <bashi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-06 00:08:32 +0000
commitc56c446ea8a4509712b5de7ce7cc750034b2a826 (patch)
tree6bf9bdb68977058bed0ed2a2f62dc7a9ec3f8cc5 /third_party/brotli
parenta24e7a184226b75f1e66cba406b0b38c45ddeeb1 (diff)
downloadchromium_src-c56c446ea8a4509712b5de7ce7cc750034b2a826.zip
chromium_src-c56c446ea8a4509712b5de7ce7cc750034b2a826.tar.gz
chromium_src-c56c446ea8a4509712b5de7ce7cc750034b2a826.tar.bz2
Add woff2_dec target
Preparation for removing woff2 from ots TEST=compiled woff2_dec target BUG=371267 Review URL: https://codereview.chromium.org/305013005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275279 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/brotli')
-rw-r--r--third_party/brotli/BUILD.gn23
-rw-r--r--third_party/brotli/README.chromium2
-rw-r--r--third_party/brotli/brotli.gyp22
3 files changed, 46 insertions, 1 deletions
diff --git a/third_party/brotli/BUILD.gn b/third_party/brotli/BUILD.gn
index 5696b1d..73fb5b9 100644
--- a/third_party/brotli/BUILD.gn
+++ b/third_party/brotli/BUILD.gn
@@ -26,3 +26,26 @@ source_set("brotli") {
include_dirs = [ "src/brotli/dec" ]
}
+
+source_set("woff2_dec") {
+ sources = [
+ "src/woff2/buffer.h",
+ "src/woff2/round.h",
+ "src/woff2/store_bytes.h",
+ "src/woff2/table_tags.cc",
+ "src/woff2/table_tags.h",
+ "src/woff2/woff2_common.h",
+ "src/woff2/woff2_dec.cc",
+ "src/woff2/woff2_dec.h",
+ ]
+
+ configs -= [ "//build/config/compiler:chromium_code" ]
+ configs += [ "//build/config/compiler:no_chromium_code" ]
+
+ deps = [ ":brotli" ]
+
+ include_dirs = [
+ "src/brotli/dec",
+ "src/woff2",
+ ]
+}
diff --git a/third_party/brotli/README.chromium b/third_party/brotli/README.chromium
index c17c9c3..c5284c4 100644
--- a/third_party/brotli/README.chromium
+++ b/third_party/brotli/README.chromium
@@ -2,7 +2,7 @@ Name: Brotli
URL: https://code.google.com/p/font-compression-reference/
Version: 0
License: Apache 2.0
-License File: src/brotli/LICENSE
+License File: src/LICENSE
Security Critical: yes
Description:
diff --git a/third_party/brotli/brotli.gyp b/third_party/brotli/brotli.gyp
index 8e54f03..e074658 100644
--- a/third_party/brotli/brotli.gyp
+++ b/third_party/brotli/brotli.gyp
@@ -1,6 +1,7 @@
# Copyright 2013 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+# TODO(bashi): Rename this directory to font-compression-reference
{
'targets': [
@@ -28,5 +29,26 @@
'src/brotli/dec/types.h',
],
},
+ {
+ 'target_name': 'woff2_dec',
+ 'type': 'static_library',
+ 'include_dirs': [
+ 'src/brotli/dec',
+ 'src/woff2',
+ ],
+ 'dependencies': [
+ 'brotli',
+ ],
+ 'sources': [
+ 'src/woff2/buffer.h',
+ 'src/woff2/round.h',
+ 'src/woff2/store_bytes.h',
+ 'src/woff2/table_tags.cc',
+ 'src/woff2/table_tags.h',
+ 'src/woff2/woff2_common.h',
+ 'src/woff2/woff2_dec.cc',
+ 'src/woff2/woff2_dec.h',
+ ],
+ },
],
}