diff options
| author |  bungeman <bungeman@google.com> | 2016-08-26 12:15:54 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-08-26 12:15:54 -0700 |
| commit | 7147ee1b80ca739985e700e7c665f26653b84a76 (patch) | |
| tree | ede38fdf4e66c59fb0ce186f5612e595983ce3c5 | |
| parent | f0f489062a509dbf9212478894f690b00ed7ceb7 (diff) | |
Expat target exports includes instead of FreeType.
Currently when building for Android framework the freetype target
exports the expat include directory, but the freetype target neither
uses nor logically provides this information. Instead, the expat target
itself should do this.
Review-Url: https://codereview.chromium.org/2283903003
| -rw-r--r-- | gyp/android_deps.gyp | 3 | ||||
| -rw-r--r-- | gyp/freetype.gyp | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/gyp/android_deps.gyp b/gyp/android_deps.gyp index fb15d18e1a..4cbb6e8d5e 100644 --- a/gyp/android_deps.gyp +++ b/gyp/android_deps.gyp @@ -37,6 +37,9 @@ 'libraries' : [ '-lexpat', ], + 'include_dirs': [ + 'external/expat/lib', + ], }, }, { diff --git a/gyp/freetype.gyp b/gyp/freetype.gyp index 6ebd168498..583f86f375 100644 --- a/gyp/freetype.gyp +++ b/gyp/freetype.gyp @@ -63,7 +63,6 @@ ], }, 'include_dirs': [ - 'external/expat/lib', 'external/freetype/include', ], 'libraries': [ |