ots-standalone.gyp - Issue 658573004: Updating to new OTS repo from https://github.com/khaledhosny/ots.git

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ots-standalone.gyp

Issue 658573004: Updating to new OTS repo from https://github.com/khaledhosny/ots.git (Closed) Base URL: https://chromium.googlesource.com/external/ots@master

Patch Set: Adding Colored Emoji changes from external/git repo Created 6 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: ots-standalone.gyp

diff --git a/ots-standalone.gyp b/ots-standalone.gyp

old mode 100644

new mode 100755

index 90ab4ec7296524d044edf2b28dff02f0465d99ee..c8b8b946bead35b787989af82f85b87bf61bcbab

--- a/ots-standalone.gyp

+++ b/ots-standalone.gyp

@@ -8,7 +8,7 @@

'-ggdb',

'-W',

'-Wall',

- '-Werror',

+ '-Wshadow',

'-Wno-unused-parameter',

'-fPIE',

'-fstack-protector',

@@ -24,10 +24,14 @@

'ots-common.gypi',

'target_defaults': {

+ 'include_dirs': [

+ '.',

+ ],

'conditions': [

['OS=="linux"', {

'cflags': [

'<@(gcc_cflags)',

+ '-O',

'ldflags': [

'<@(gcc_ldflags)',

@@ -67,7 +71,7 @@

'include_dirs': [

- 'third_party/zlib'

+ 'third_party/zlib',

'defines': [

'NOMINMAX', # To suppress max/min macro definition.

@@ -83,11 +87,8 @@

'sources': [

'<@(ots_sources)',

- 'defines': [

- 'OTS_DEBUG',

- ],

'dependencies': [

- 'third_party/lzma_sdk/lzma_sdk.gyp:ots_lzma_sdk',

+ 'third_party/brotli/brotli.gyp:brotli',

'include_dirs': [

'<@(ots_include_dirs)',

« .gitmodules ('K') | « ots-common.gypi ('k') | src/cbdt.h » ('j') | no next file with comments »