diff options
| author | steveblock@chromium.org <steveblock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-10 09:02:25 +0000 |
|---|---|---|
| committer | steveblock@chromium.org <steveblock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-10 09:02:25 +0000 |
| commit | 03bdcc125c73f2a13452ffd6ede45523c2879fd3 (patch) | |
| tree | 9351ecf7c7400979ccc3966356178ae286648ae9 /third_party | |
| parent | ea085379043008ab662b8106c8067488a4fea058 (diff) | |
| download | chromium_src-03bdcc125c73f2a13452ffd6ede45523c2879fd3.zip chromium_src-03bdcc125c73f2a13452ffd6ede45523c2879fd3.tar.gz chromium_src-03bdcc125c73f2a13452ffd6ede45523c2879fd3.tar.bz2 | |
Add a gyp flag to allow use of the system's version of libexpat
Hook up this flag for Android and enable it when building with the Android
build system.
Review URL: https://chromiumcodereview.appspot.com/10704079
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145854 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/expat/expat.gyp | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/third_party/expat/expat.gyp b/third_party/expat/expat.gyp index 0423acd..575a00c 100644 --- a/third_party/expat/expat.gyp +++ b/third_party/expat/expat.gyp @@ -3,6 +3,17 @@ # found in the LICENSE file. { + 'variables': { + 'conditions': [ + # On Linux, we implicitly already depend on expat via fontconfig; + # let's not pull it in twice. + ['os_posix == 1 and OS != "mac" and OS != "android"', { + 'use_system_expat%': 1, + }, { + 'use_system_expat%': 0, + }], + ], + }, 'target_defaults': { 'defines': [ '_LIB', @@ -11,13 +22,9 @@ 'include_dirs': [ 'files/lib', ], - 'dependencies': [ - ] }, 'conditions': [ - ['os_posix == 1 and OS != "mac" and OS != "android"', { - # On Linux, we implicitly already depend on expat via fontconfig; - # let's not pull it in twice. + ['use_system_expat == 1', { 'targets': [ { 'target_name': 'expat', @@ -27,9 +34,18 @@ '-lexpat', ], }, + 'conditions': [ + ['OS=="android"', { + 'direct_dependent_settings': { + 'include_dirs': [ + '<(android_src)/external/expat/lib', + ], + }, + }], + ], }, ], - }, { # OS != linux + }, { # else: use_system_expat != 1 'targets': [ { 'target_name': 'expat', |