| 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   has_chrome_android_internal = | 8   has_chrome_android_internal = | 
| 9       exec_script("//build/dir_exists.py", | 9       exec_script("//build/dir_exists.py", | 
| 10                   [ rebase_path("//clank", root_build_dir) ], | 10                   [ rebase_path("//clank", root_build_dir) ], | 
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 58 | 58 | 
| 59     # Set to true to run findbugs on JAR targets. | 59     # Set to true to run findbugs on JAR targets. | 
| 60     run_findbugs = false | 60     run_findbugs = false | 
| 61 | 61 | 
| 62     # Set to true to enable verbose findbugs logging. This does nothing if | 62     # Set to true to enable verbose findbugs logging. This does nothing if | 
| 63     # run_findbugs is false. | 63     # run_findbugs is false. | 
| 64     findbugs_verbose = false | 64     findbugs_verbose = false | 
| 65 | 65 | 
| 66     # Set to true to enable the Errorprone compiler | 66     # Set to true to enable the Errorprone compiler | 
| 67     use_errorprone_java_compiler = false | 67     use_errorprone_java_compiler = false | 
|  | 68 | 
|  | 69     # Disables process isolation when building _incremental targets. | 
|  | 70     # Required for Android M+ due to SELinux policies (stronger sandboxing). | 
|  | 71     disable_incremental_isolated_processes = false | 
| 68   } | 72   } | 
| 69 | 73 | 
| 70   # Host stuff ----------------------------------------------------------------- | 74   # Host stuff ----------------------------------------------------------------- | 
| 71 | 75 | 
| 72   # Defines the name the Android build gives to the current host CPU | 76   # Defines the name the Android build gives to the current host CPU | 
| 73   # architecture, which is different than the names GN uses. | 77   # architecture, which is different than the names GN uses. | 
| 74   if (host_cpu == "x64") { | 78   if (host_cpu == "x64") { | 
| 75     android_host_arch = "x86_64" | 79     android_host_arch = "x86_64" | 
| 76   } else if (host_cpu == "x86") { | 80   } else if (host_cpu == "x86") { | 
| 77     android_host_arch = "x86" | 81     android_host_arch = "x86" | 
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 207   } else if (current_cpu == "x64") { | 211   } else if (current_cpu == "x64") { | 
| 208     android_app_abi = "x86_64" | 212     android_app_abi = "x86_64" | 
| 209   } else if (current_cpu == "arm64") { | 213   } else if (current_cpu == "arm64") { | 
| 210     android_app_abi = "arm64-v8a" | 214     android_app_abi = "arm64-v8a" | 
| 211   } else if (current_cpu == "mips64el") { | 215   } else if (current_cpu == "mips64el") { | 
| 212     android_app_abi = "mips64" | 216     android_app_abi = "mips64" | 
| 213   } else { | 217   } else { | 
| 214     assert(false, "Unknown Android ABI: " + current_cpu) | 218     assert(false, "Unknown Android ABI: " + current_cpu) | 
| 215   } | 219   } | 
| 216 } | 220 } | 
| OLD | NEW | 
|---|