Revert "Add option to GYP to use chromium clang plugins."
This reverts commit 44beca7313284a60c21b4973d42f993b8c248ec9.
Reason: broken build on chromium bots.
R=ochang@chromium.org
TBR=dsinclair@chromium.org
Review URL: https://codereview.chromium.org/1766823002 .
diff --git a/pdfium.gyp b/pdfium.gyp
index 8c902e6..149bcc0 100644
--- a/pdfium.gyp
+++ b/pdfium.gyp
@@ -6,12 +6,6 @@
'variables': {
# TODO(thakis): Enable this, pdfium:29
#'chromium_code': 1,
-
- 'variables': {
- 'clang_use_chrome_plugins%': 0,
- },
- 'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)',
-
'pdf_use_skia%': 0,
'pdf_enable_v8%': 1,
'pdf_enable_xfa%': 0, # Set to 1 by standalone.gypi in a standalone build.
@@ -22,33 +16,6 @@
# few methods are used from it.
'bundle_freetype%': 1,
}],
- ['clang_use_chrome_plugins==1', {
- 'variables': {
- 'conditions': [
- ['OS!="win"', {
- 'variables': {
- 'conditions': [
- ['OS=="mac" or OS=="ios"', {
- 'clang_lib_path%': '<!(cd <(DEPTH) && pwd -P)/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib',
- }, { # OS != "mac" or OS != "ios"
- 'clang_lib_path%': '<!(cd <(DEPTH) && pwd -P)/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.so',
- }],
- ],
- },
- 'clang_dynlib_flags%': '-Xclang -load -Xclang <(clang_lib_path) ',
- }, { # OS == "win"
- # On Windows, the plugin is built directly into clang, so there's
- # no need to load it dynamically.
- 'clang_dynlib_flags%': '',
- }],
- ],
- 'clang_plugin_args%': '-Xclang -plugin-arg-find-bad-constructs -Xclang check-templates '
- '-Xclang -plugin-arg-find-bad-constructs -Xclang follow-macro-expansion ',
- },
- 'clang_chrome_plugins_flags%':
- '<(clang_dynlib_flags)'
- '-Xclang -add-plugin -Xclang find-bad-constructs <(clang_plugin_args)',
- }],
],
},
'target_defaults': {
@@ -87,11 +54,6 @@
}],
],
}],
- ['clang==1 and clang_use_chrome_plugins==1', {
- 'cflags': [
- '<@(clang_chrome_plugins_flags)',
- ],
- }],
],
'msvs_disabled_warnings': [
4005, 4018, 4146, 4333, 4345, 4267,
