From e7f4fa57138c2ed44235456d8bcfbe165ad1938c Mon Sep 17 00:00:00 2001
From: pasko <pasko@chromium.org>
Date: Wed, 3 Dec 2014 03:47:20 -0800
Subject: Revert "Use thumb versions of external libraries with ARMv7."

This reverts commit 3572927ce7c9ce6d528820f9575a93985f9309bf.

Reason: 9% regression on thread_renderer_compositor_cpu_time_per_frame/http___slashdot.org_.

BUG=431612
TBR=brettw

Review URL: https://codereview.chromium.org/772123003

Cr-Commit-Position: refs/heads/master@{#306589}
---
 build/config/android/config.gni | 43 ++++++++++++++++++-----------------------
 1 file changed, 19 insertions(+), 24 deletions(-)

(limited to 'build/config/android/config.gni')

diff --git a/build/config/android/config.gni b/build/config/android/config.gni
index 99abf95..e2bd165 100644
--- a/build/config/android/config.gni
+++ b/build/config/android/config.gni
@@ -39,23 +39,6 @@ if (is_android) {
     android_chrome_build_id = "\"\""
   }
 
-  # ABI ------------------------------------------------------------------------
-
-  if (cpu_arch == "x86") {
-    android_app_abi = "x86"
-  } else if (cpu_arch == "arm") {
-    import("//build/config/arm.gni")
-    if (arm_version < 7) {
-      android_app_abi = "armeabi"
-    } else {
-      android_app_abi = "armeabi-v7a"
-    }
-  } else if (cpu_arch == "mipsel") {
-    android_app_abi = "mips"
-  } else {
-    assert(false, "Unknown Android ABI: " + cpu_arch)
-  }
-
   # Host stuff -----------------------------------------------------------------
 
   # Defines the name the Android build gives to the current host CPU
@@ -132,13 +115,8 @@ if (is_android) {
     android_prebuilt_arch = "android-arm"
     _binary_prefix = "arm-linux-androideabi"
     android_toolchain_root = "$arm_android_toolchain_root"
-    if (arm_use_thumb) {
-      android_libgcc_file =
-          "$android_toolchain_root/lib/gcc/arm-linux-androideabi/${_android_toolchain_version}/thumb/libgcc.a"
-    } else {
-      android_libgcc_file =
-          "$android_toolchain_root/lib/gcc/arm-linux-androideabi/${_android_toolchain_version}/libgcc.a"
-    }
+    android_libgcc_file =
+        "$android_toolchain_root/lib/gcc/arm-linux-androideabi/${_android_toolchain_version}/libgcc.a"
   } else if (cpu_arch == "mipsel") {
     android_prebuilt_arch = "android-mips"
     _binary_prefix = "mipsel-linux-android"
@@ -162,6 +140,23 @@ if (is_android) {
   } else {
     android_stlport_library = "stlport_static"
   }
+
+  # ABI ------------------------------------------------------------------------
+
+  if (cpu_arch == "x86") {
+    android_app_abi = "x86"
+  } else if (cpu_arch == "arm") {
+    import("//build/config/arm.gni")
+    if (arm_version < 7) {
+      android_app_abi = "armeabi"
+    } else {
+      android_app_abi = "armeabi-v7a"
+    }
+  } else if (cpu_arch == "mipsel") {
+    android_app_abi = "mips"
+  } else {
+    assert(false, "Unknown Android ABI: " + cpu_arch)
+  }
 } else {
   if (!defined(is_android_webview_build)) {
     is_android_webview_build = false
-- 
cgit v1.1