summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--AUTHORS1
-rw-r--r--pdfium.gyp28
2 files changed, 2 insertions, 27 deletions
diff --git a/AUTHORS b/AUTHORS
index 75f19e5e89..33cdb9d19d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -8,6 +8,7 @@
#
# See python fnmatch module documentation for more information.
+Andrey Khalyavin <halyavin@chromium.org>
John Abd-El-Malek <jam@chromium.org>
Julien Tinnes <jln@chromium.org>
Lucas Nihlen <luken@chromium.org>
diff --git a/pdfium.gyp b/pdfium.gyp
index 8cf3950a68..9f2cd3d228 100644
--- a/pdfium.gyp
+++ b/pdfium.gyp
@@ -40,7 +40,7 @@
'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO', # -Werror
},
}],
- ['clang==1', {
+ ['clang==1', {
'cflags!': [
'-Werror',
],
@@ -820,30 +820,4 @@
],
},
],
- 'conditions': [
- ['OS=="mac" or OS=="linux"', {
- 'targets': [
- {
- 'target_name': 'gcctest',
- 'type': 'executable',
- 'dependencies': [
- 'fpdfsdk',
- ],
- 'conditions': [
- ['OS=="mac"', {
- 'link_settings': {
- 'libraries': [
- '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
- ],
- },
- }],
- ],
- 'sources': [
- 'test/gcctest.cpp',
- ],
- }
- ],
- }],
- ],
}
-