summaryrefslogtreecommitdiffstats
path: root/DEPS
diff options
context:
space:
mode:
authoryfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-16 17:09:47 +0000
committeryfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-16 17:09:47 +0000
commitd7c427ad6b0e7edd0f4ba2bc948df56a9847f754 (patch)
treee98f17091606909b94876390083f2552d121aab5 /DEPS
parent0b6e4e0fe970154171fa633102704dbfa0ee4684 (diff)
downloadchromium_src-d7c427ad6b0e7edd0f4ba2bc948df56a9847f754.zip
chromium_src-d7c427ad6b0e7edd0f4ba2bc948df56a9847f754.tar.gz
chromium_src-d7c427ad6b0e7edd0f4ba2bc948df56a9847f754.tar.bz2
Roll freetype DEPS to 96551feab72aac26836e9aaf4fae0962d39d5ab0
Includes: 96551fe Reference in gyp files that were added in ec53de77a7ec24f862372a39333f8e91708a806d 044c6dc Add additional implementation files needed by Skia. c3ee10b Update to FreeType 2.4.6+ 0b9d478 Remove the simulator target from all makefiles. Bug: 5010576 8583905 Upgrade to upstream 2.4.4 This brings our freetype inline with the Android Browser's version of skia from ICS (which is what skia is compatible with) BUG=158821 NOTRY=true Review URL: https://chromiumcodereview.appspot.com/11348085 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168228 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'DEPS')
-rw-r--r--DEPS2
1 files changed, 1 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index 0d09b3d..c03462a 100644
--- a/DEPS
+++ b/DEPS
@@ -547,7 +547,7 @@ deps_os = {
"android": {
"src/third_party/freetype":
Var("chromium_git") + "/chromium/src/third_party/freetype.git" +
- "@41c2c4116acca09389cc5fe2ea393eaada546422",
+ "@96551feab72aac26836e9aaf4fae0962d39d5ab0",
"src/third_party/aosp":
"/trunk/deps/third_party/aosp@148330",