diff options
| author | michaelbai@chromium.org <michaelbai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-03 22:56:57 +0000 |
|---|---|---|
| committer | michaelbai@chromium.org <michaelbai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-03 22:56:57 +0000 |
| commit | 6efddb457767a3c88ef8be5390f9cba9ea7d2643 (patch) | |
| tree | d722da4724438246ea79530a2fd6342565f20d8e /third_party/harfbuzz | |
| parent | dd11de5271aeb0a9ac95901f3a3737a3a49c54ca (diff) | |
| download | chromium_src-6efddb457767a3c88ef8be5390f9cba9ea7d2643.zip chromium_src-6efddb457767a3c88ef8be5390f9cba9ea7d2643.tar.gz chromium_src-6efddb457767a3c88ef8be5390f9cba9ea7d2643.tar.bz2 | |
Upstream: Make harfbuzz build on Android
BUG=
TEST=
Review URL: http://codereview.chromium.org/8450014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108568 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/harfbuzz')
| -rw-r--r-- | third_party/harfbuzz/README.chromium | 2 | ||||
| -rw-r--r-- | third_party/harfbuzz/harfbuzz.gyp | 14 |
2 files changed, 13 insertions, 3 deletions
diff --git a/third_party/harfbuzz/README.chromium b/third_party/harfbuzz/README.chromium index aa11614..12fd39a 100644 --- a/third_party/harfbuzz/README.chromium +++ b/third_party/harfbuzz/README.chromium @@ -16,3 +16,5 @@ The patch in chromium.patch was applied on top of this; I will talk with upstream about it. (Note that chromium.patch is just a record of our changes against upstream; you must also apply any changes that you make to the checked-in copy of the source.) + +Added support for building on Android. diff --git a/third_party/harfbuzz/harfbuzz.gyp b/third_party/harfbuzz/harfbuzz.gyp index f029881..1ed90b9 100644 --- a/third_party/harfbuzz/harfbuzz.gyp +++ b/third_party/harfbuzz/harfbuzz.gyp @@ -1,4 +1,4 @@ -# Copyright (c) 2009 The Chromium Authors. All rights reserved. +# Copyright (c) 2011 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -45,8 +45,16 @@ 'src', ], }, - 'dependencies': [ - '../../build/linux/system.gyp:freetype2', + 'conditions': [ + ['OS == "android"', { + 'dependencies': [ + '../../third_party/freetype/freetype.gyp:ft2', + ], + }, { # OS != android + 'dependencies': [ + '../../build/linux/system.gyp:freetype2', + ], + }], ], }, ], |