| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 # This file contains common system config stuff for the Android build. | 5 # This file contains common system config stuff for the Android build. |
| 6 | 6 |
| 7 # TODO(brettw) bug 341772 put this into the is_android block when the toolchain | 7 # TODO(brettw) bug 341772 put this into the is_android block when the toolchain |
| 8 # stuff is fixed in the GYP generator. The problem is that when we redo the | 8 # stuff is fixed in the GYP generator. The problem is that when we redo the |
| 9 # build in host mode, the OS is not android and the declarations are never | 9 # build in host mode, the OS is not android and the declarations are never |
| 10 # seen, which throws an error because these arguments are specified. | 10 # seen, which throws an error because these arguments are specified. |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 48 } else if (cpu_arch == "arm") { | 48 } else if (cpu_arch == "arm") { |
| 49 import("//build/config/arm.gni") | 49 import("//build/config/arm.gni") |
| 50 if (arm_version < 7) { | 50 if (arm_version < 7) { |
| 51 android_app_abi = "armeabi" | 51 android_app_abi = "armeabi" |
| 52 } else { | 52 } else { |
| 53 android_app_abi = "armeabi-v7a" | 53 android_app_abi = "armeabi-v7a" |
| 54 } | 54 } |
| 55 } else if (cpu_arch == "mipsel") { | 55 } else if (cpu_arch == "mipsel") { |
| 56 android_app_abi = "mips" | 56 android_app_abi = "mips" |
| 57 } else { | 57 } else { |
| 58 assert(false, "Unknown Android ABI") | 58 assert(false, "Unknown Android ABI: " + cpu_arch) |
| 59 } | 59 } |
| 60 } else { | 60 } else { |
| 61 if (!defined(is_android_webview_build)) { | 61 if (!defined(is_android_webview_build)) { |
| 62 is_android_webview_build = false | 62 is_android_webview_build = false |
| 63 } | 63 } |
| 64 use_system_stlport = false | 64 use_system_stlport = false |
| 65 } | 65 } |
| OLD | NEW |