diff options
| author | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-21 12:37:39 +0000 |
|---|---|---|
| committer | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-21 12:37:39 +0000 |
| commit | 430a596fcf99baa858bb1b0cddf652c3f6c7e6fa (patch) | |
| tree | c5a0746dfc17532e77cc2de5fd17c5b09b558684 /third_party/libwebp | |
| parent | e906dbe3003d2e057af6ff896bbdec9f9118ad75 (diff) | |
| download | chromium_src-430a596fcf99baa858bb1b0cddf652c3f6c7e6fa.zip chromium_src-430a596fcf99baa858bb1b0cddf652c3f6c7e6fa.tar.gz chromium_src-430a596fcf99baa858bb1b0cddf652c3f6c7e6fa.tar.bz2 | |
Android: fix cpu_features for WebView build.
The WebView build doesn't have third_party/android_tools/ndk with the
added gyp file, but the cpufeatures code has already been built as part
of the system. Introduce a .gypi that can be included to get the
appropriate dependency for the current build type.
BUG=
Review URL: https://codereview.chromium.org/11417114
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169026 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libwebp')
| -rw-r--r-- | third_party/libwebp/libwebp.gyp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/third_party/libwebp/libwebp.gyp b/third_party/libwebp/libwebp.gyp index b3d9ee2..2fe4a4b 100644 --- a/third_party/libwebp/libwebp.gyp +++ b/third_party/libwebp/libwebp.gyp @@ -44,9 +44,7 @@ ], 'conditions': [ ['OS == "android"', { - 'dependencies': [ - '<(android_ndk_root)/android_tools_ndk.gyp:cpu_features', - ], + 'includes': [ '../../build/android/cpufeatures.gypi' ], }], ['order_profiling != 0', { 'target_conditions' : [ |