Revert of https://codereview.chromium.org/113203003/

Reason for revert: Broken under XCode.

R=bungeman@google.com, epoger@google.com
TBR=bungeman@google.com, epoger@google.com
NOTREECHECKS=true
NOTRY=true

Author: vandebo@chromium.org

Review URL: https://codereview.chromium.org/132093003

git-svn-id: http://skia.googlecode.com/svn/trunk@12997 2bbb7eff-a529-9590-31e7-b0007b416f81

3 files changed, 4 insertions, 64 deletions

diff --git a/third_party/fontconfig/README.chromium b/third_party/fontconfig/README.chromium
index 07bc5f59f8..f9ea5b62b3 100644
--- a/third_party/fontconfig/README.chromium
+++ b/third_party/fontconfig/README.chromium
@@ -33,14 +33,9 @@ third_party/fontconfig/config:
   fc-lang/fclang.h
   src/fcobjshash.h
 
-On Mac, these are the files generated by
-  ./configure --with-add-fonts=/System/Library/Fonts,/Library/Fonts
-config/mac/config.h.template then has a section added to the top:
-
-+/* Manually added template defines */
-+#define FC_CACHEDIR "@FC_CACHEDIR@"
-+#define FONTCONFIG_PATH "@FONTCONFIG_PATH@"
-
+On Linux and Mac, these are the files generated by ./configure, with no
+additional flags.
 On Windows, the configuration files were from
 http://comments.gmane.org/gmane.comp.fonts.fontconfig/4438
 (fontconfig development list).
+
diff --git a/third_party/fontconfig/config/mac/config.h.template b/third_party/fontconfig/config/mac/config.h
index 3eea946a19..963ede8494 100644
--- a/third_party/fontconfig/config/mac/config.h.template
+++ b/third_party/fontconfig/config/mac/config.h
@@ -1,10 +1,6 @@
 /* config.h.  Generated from config.h.in by configure.  */
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
-/* Manually added template defines */
-#define FC_CACHEDIR "@FC_CACHEDIR@"
-#define FONTCONFIG_PATH "@FONTCONFIG_PATH@"
-
 /* Define if building universal (internal helper macro) */
 /* #undef AC_APPLE_UNIVERSAL_BUILD */
 
@@ -15,7 +11,7 @@
 /* #undef ENABLE_LIBXML2 */
 
 /* Additional font directories */
-#define FC_ADD_FONTS "/System/Library/Fonts,/Library/Fonts"
+#define FC_ADD_FONTS "yes"
 
 /* Architecture prefix to use for cache file names */
 /* #undef FC_ARCHITECTURE */
diff --git a/third_party/fontconfig/process-template.py b/third_party/fontconfig/process-template.py
deleted file mode 100755
index 5ea60bdb8a..0000000000
--- a/third_party/fontconfig/process-template.py
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/python
-
-# Copyright 2014 Google Inc.
-#
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# A simple template processing script.
-
-import argparse
-import os
-import sys
-
-parser = argparse.ArgumentParser()
-parser.add_argument('-i', '--input')
-parser.add_argument('-o', '--output')
-parser.add_argument(
-    '-k', '--keyword_substitution',  action='append', nargs=2,
-     metavar=('KEY', 'VALUE'), help='Changes KEY to VALUE in the template.')
-parser.add_argument(
-    '-p', '--path_substitution', action='append', nargs=2,
-    metavar=('KEY', 'PATH'),
-    help='Makes PATH absolute then changes KEY to PATH in the template.')
-
-args = parser.parse_args()
-
-input = sys.stdin
-if args.input:
-  input = open(args.input, 'r')
-
-output = sys.stdout
-if args.output:
-  output = open(args.output, 'w')
-
-path_subs = None
-if args.path_substitution:
-  path_subs = [
-      [sub[0], os.path.abspath(sub[1])] for sub in args.path_substitution
-  ]
-
-for line in input:
-  if args.keyword_substitution:
-    for (key, value) in args.keyword_substitution:
-      line = line.replace(key, value)
-  if path_subs:
-    for (key, path) in path_subs:
-      line = line.replace(key, path)
-  output.write(line)
-
-input.close()
-output.close()