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 /build | |
| 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 'build')
| -rw-r--r-- | build/android/cpufeatures.gypi | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/build/android/cpufeatures.gypi b/build/android/cpufeatures.gypi new file mode 100644 index 0000000..17b262c --- /dev/null +++ b/build/android/cpufeatures.gypi @@ -0,0 +1,20 @@ +# Copyright (c) 2012 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. + +# Depend on the Android NDK's cpu feature detection. The WebView build is part +# of the system and the library already exists; for the normal build there is a +# gyp file in the checked-in NDK to build it. +{ + 'conditions': [ + ['android_build_type != 0', { + 'libraries': [ + 'cpufeatures.a' + ], + }, { + 'dependencies': [ + '<(android_ndk_root)/android_tools_ndk.gyp:cpu_features', + ], + }], + ], +} |