Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(800)

Unified Diff: gyp/iconv.gyp

Issue 294683003: Since we're only using it on Linux now, just require poppler as a system dependency. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: set -e Created 6 years, 7 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
« no previous file with comments | « gyp/gm.gyp ('k') | gyp/poppler.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/iconv.gyp
diff --git a/gyp/iconv.gyp b/gyp/iconv.gyp
deleted file mode 100644
index fbe16f79d83476c2c1eac4023ffcf1a432cc9fd7..0000000000000000000000000000000000000000
--- a/gyp/iconv.gyp
+++ /dev/null
@@ -1,43 +0,0 @@
-# GYP for iconv
-#
-# NOTE: WINDOWS BUILD ONLY.
-# iconv should be native to Mac and Linux.
-#
-# Based on instructions found on http://www.codeproject.com/Articles/302012/How-to-Build-libiconv-with-Microsoft-Visual-Studio
-# See the relevant README.chromium file for more information.
-
-{
- 'variables': {
- 'skia_warnings_as_errors': 0,
- },
- 'targets': [
- {
- 'target_name': 'iconv',
- 'type': 'static_library',
- 'include_dirs' : [
- '../third_party/externals/iconv/lib',
- '../third_party/iconv/config',
- ],
- 'sources': [
- '../third_party/externals/iconv/lib/iconv.c',
- '../third_party/externals/iconv/libcharset/lib/localcharset.c',
- ],
-
- 'conditions': [
- ['skia_os == "win"', {
- 'include_dirs': [
- '../third_party/iconv/config/windows',
- ],
- 'direct_dependent_settings': {
- 'include_dirs': [
- '../third_party/iconv/config/windows',
- ],
- },
- 'defines': [
- 'LIBDIR',
- ],
- }],
- ],
- },
- ],
-}
« no previous file with comments | « gyp/gm.gyp ('k') | gyp/poppler.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698