summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorpeter@chromium.org <peter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-06 13:10:07 +0000
committerpeter@chromium.org <peter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-06 13:10:07 +0000
commit94506280919143cc0acdaa354ea84b88ff2a58b7 (patch)
treee38b6fe2068822ef8dab90b0cbc3b0097b485e7b /build
parent8600e1b767b582276c0d51165d886c99b098545a (diff)
downloadchromium_src-94506280919143cc0acdaa354ea84b88ff2a58b7.zip
chromium_src-94506280919143cc0acdaa354ea84b88ff2a58b7.tar.gz
chromium_src-94506280919143cc0acdaa354ea84b88ff2a58b7.tar.bz2
Always enable the ARMv7 architecture for Android builds
BUG= TEST= Review URL: http://codereview.chromium.org/9111018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116662 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rwxr-xr-xbuild/android/envsetup.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/build/android/envsetup.sh b/build/android/envsetup.sh
index 3fa1918..78da360 100755
--- a/build/android/envsetup.sh
+++ b/build/android/envsetup.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (c) 2011 The Chromium Authors. All rights reserved.
+# 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.
@@ -133,7 +133,7 @@ fi
case "${TARGET_PRODUCT}" in
"full")
DEFINES+=" target_arch=arm"
- DEFINES+=" arm_neon=0 armv7=0 arm_thumb=1 arm_fpu=vfp"
+ DEFINES+=" arm_neon=0 armv7=1 arm_thumb=1 arm_fpu=vfpv3-d16"
;;
*x86*)
DEFINES+=" target_arch=ia32 use_libffmpeg=0"