diff options
| author | weili <weili@chromium.org> | 2016-07-01 15:59:48 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-07-01 15:59:48 -0700 |
| commit | 1d13fb7be58a0909f532e4f4da572e69ecbb2c8e (patch) | |
| tree | 073dcc3f0c53fbcfa822697b9e09ec2be7d15643 /pdfium.gyp | |
| parent | 08e707273ef50c3a2365ff976e96e761800016d3 (diff) | |
| download | pdfium-1d13fb7be58a0909f532e4f4da572e69ecbb2c8e.tar.xz | |
Enable compiling with clang chrome plugins for GYP build
For standalone build, enable the compilation with
clang_use_chrome_plugins. Also remove the previous
clang_use_pdfium_plugins to be consistent with chrome
build, also avoid errors on chromeos_ozone build.
BUG=pdfium:469
Review-Url: https://codereview.chromium.org/2115813002
Diffstat (limited to 'pdfium.gyp')
| -rw-r--r-- | pdfium.gyp | 41 |
1 files changed, 3 insertions, 38 deletions
diff --git a/pdfium.gyp b/pdfium.gyp index ca9f3f8aad..e54223cc2f 100644 --- a/pdfium.gyp +++ b/pdfium.gyp @@ -5,15 +5,12 @@ { 'variables': { 'chromium_code': 1, - - 'variables': { - 'clang_use_pdfium_plugins%': 0, - }, - 'clang_use_pdfium_plugins%': '<(clang_use_pdfium_plugins)', - 'pdf_use_skia%': 0, 'pdf_enable_v8%': 1, 'pdf_enable_xfa%': 0, # Set to 1 by standalone.gypi in a standalone build. + 'variables': { + 'clang_use_chrome_plugins': 1, + }, 'conditions': [ ['OS=="linux"', { 'bundle_freetype%': 0, @@ -21,33 +18,6 @@ # few methods are used from it. 'bundle_freetype%': 1, }], - ['clang_use_pdfium_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_pdfium_plugins_flags%': - '<(clang_dynlib_flags)' - '-Xclang -add-plugin -Xclang find-bad-constructs <(clang_plugin_args)', - }], ], }, 'target_defaults': { @@ -85,11 +55,6 @@ }], ], }], - ['clang==1 and clang_use_pdfium_plugins==1', { - 'cflags': [ - '<@(clang_pdfium_plugins_flags)', - ], - }], ], 'msvs_disabled_warnings': [ 4267, |