summaryrefslogtreecommitdiffstats
path: root/third_party/libwebp
diff options
context:
space:
mode:
authorjzern@chromium.org <jzern@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-12 02:29:19 +0000
committerjzern@chromium.org <jzern@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-12 02:29:19 +0000
commit345c042daeef99ce09973a056986da5dae0c1e96 (patch)
tree9470c2323a9ee29c17cd5f4b76e4445386238745 /third_party/libwebp
parent27ee16ff2b9370d70fb93233b73ec01856f08017 (diff)
downloadchromium_src-345c042daeef99ce09973a056986da5dae0c1e96.zip
chromium_src-345c042daeef99ce09973a056986da5dae0c1e96.tar.gz
chromium_src-345c042daeef99ce09973a056986da5dae0c1e96.tar.bz2
libwebp: silence libtool warning on non-neon builds
BUG=141949 TEST=build Review URL: https://chromiumcodereview.appspot.com/10855111 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151196 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libwebp')
-rw-r--r--third_party/libwebp/libwebp.gyp12
1 files changed, 7 insertions, 5 deletions
diff --git a/third_party/libwebp/libwebp.gyp b/third_party/libwebp/libwebp.gyp
index 7339fb8..ad625d9 100644
--- a/third_party/libwebp/libwebp.gyp
+++ b/third_party/libwebp/libwebp.gyp
@@ -60,16 +60,18 @@
},
{
'target_name': 'libwebp_dsp_neon',
- 'type': 'static_library',
- 'include_dirs': ['.'],
- 'sources': [
- 'dsp/dec_neon.c',
- ],
'conditions': [
['armv7 == 1', {
+ 'type': 'static_library',
+ 'include_dirs': ['.'],
+ 'sources': [
+ 'dsp/dec_neon.c',
+ ],
# behavior similar dsp_neon.c.neon in an Android.mk
'cflags!': [ '-mfpu=vfpv3-d16' ],
'cflags': [ '-mfpu=neon' ],
+ },{ # "armv7 != 1"
+ 'type': 'none',
}],
['order_profiling != 0', {
'target_conditions' : [