Chromium Code Reviews| 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 if (is_android) { | 7 if (is_android) { | 
| 8 assert(rebase_path("//", root_build_dir) == "../../", | 8 assert(rebase_path("//", root_build_dir) == "../../", | 
| 9 "Android output directory must be nested 2 levels within src/ (" + | 9 "Android output directory must be nested 2 levels within src/ (" + | 
| 10 "e.g.: out-gn/Debug). http://crbug.com/412935") | 10 "e.g.: out-gn/Debug). http://crbug.com/412935") | 
| (...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 239 if (arm_version < 7) { | 239 if (arm_version < 7) { | 
| 240 android_app_abi = "armeabi" | 240 android_app_abi = "armeabi" | 
| 241 } else { | 241 } else { | 
| 242 android_app_abi = "armeabi-v7a" | 242 android_app_abi = "armeabi-v7a" | 
| 243 } | 243 } | 
| 244 } else if (current_cpu == "mipsel") { | 244 } else if (current_cpu == "mipsel") { | 
| 245 android_app_abi = "mips" | 245 android_app_abi = "mips" | 
| 246 } else if (current_cpu == "x64") { | 246 } else if (current_cpu == "x64") { | 
| 247 android_app_abi = "x86_64" | 247 android_app_abi = "x86_64" | 
| 248 } else if (current_cpu == "arm64") { | 248 } else if (current_cpu == "arm64") { | 
| 249 import("//build/config/arm.gni") | |
| 
 
Nico
2016/04/14 15:43:55
why is this needed?
 
khasim.mohammed
2016/04/14 16:13:41
Because arm.gni has arm64 options for fpu :
else
 
 | |
| 249 android_app_abi = "arm64-v8a" | 250 android_app_abi = "arm64-v8a" | 
| 250 } else if (current_cpu == "mips64el") { | 251 } else if (current_cpu == "mips64el") { | 
| 251 android_app_abi = "mips64" | 252 android_app_abi = "mips64" | 
| 252 } else { | 253 } else { | 
| 253 assert(false, "Unknown Android ABI: " + current_cpu) | 254 assert(false, "Unknown Android ABI: " + current_cpu) | 
| 254 } | 255 } | 
| 255 } | 256 } | 
| OLD | NEW |