| 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 124 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  135   # We define may of the dirs strings here for each output architecture (rather |  135   # We define may of the dirs strings here for each output architecture (rather | 
|  136   # than just the current one) since these are needed by the Android toolchain |  136   # than just the current one) since these are needed by the Android toolchain | 
|  137   # file to define toolchains for all possible targets in one pass. |  137   # file to define toolchains for all possible targets in one pass. | 
|  138  |  138  | 
|  139   android_sdk = "${android_sdk_root}/platforms/android-${android_sdk_version}" |  139   android_sdk = "${android_sdk_root}/platforms/android-${android_sdk_version}" | 
|  140  |  140  | 
|  141   # Path to the Android NDK and SDK. |  141   # Path to the Android NDK and SDK. | 
|  142   android_ndk_root = "//third_party/android_tools/ndk" |  142   android_ndk_root = "//third_party/android_tools/ndk" | 
|  143   android_ndk_include_dir = "$android_ndk_root/usr/include" |  143   android_ndk_include_dir = "$android_ndk_root/usr/include" | 
|  144  |  144  | 
|  145   android_sdk = "${android_sdk_root}/platforms/android-${android_sdk_version}" |  | 
|  146  |  | 
|  147   android_sdk_tools = "${android_sdk_root}/tools" |  145   android_sdk_tools = "${android_sdk_root}/tools" | 
|  148   android_sdk_build_tools = |  146   android_sdk_build_tools = | 
|  149       "${android_sdk_root}/build-tools/$android_sdk_build_tools_version" |  147       "${android_sdk_root}/build-tools/$android_sdk_build_tools_version" | 
|  150  |  148  | 
|  151   # Path to the SDK's android.jar |  149   # Path to the SDK's android.jar | 
|  152   android_sdk_jar = "$android_sdk/android.jar" |  150   android_sdk_jar = "$android_sdk/android.jar" | 
|  153  |  151  | 
|  154   zipalign_path = "$android_sdk_build_tools/zipalign" |  152   zipalign_path = "$android_sdk_build_tools/zipalign" | 
|  155  |  153  | 
|  156   # Subdirectories inside android_ndk_root that contain the sysroot for the |  154   # Subdirectories inside android_ndk_root that contain the sysroot for the | 
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  243   } else if (current_cpu == "x64") { |  241   } else if (current_cpu == "x64") { | 
|  244     android_app_abi = "x86_64" |  242     android_app_abi = "x86_64" | 
|  245   } else if (current_cpu == "arm64") { |  243   } else if (current_cpu == "arm64") { | 
|  246     android_app_abi = "arm64-v8a" |  244     android_app_abi = "arm64-v8a" | 
|  247   } else if (current_cpu == "mips64el") { |  245   } else if (current_cpu == "mips64el") { | 
|  248     android_app_abi = "mips64" |  246     android_app_abi = "mips64" | 
|  249   } else { |  247   } else { | 
|  250     assert(false, "Unknown Android ABI: " + current_cpu) |  248     assert(false, "Unknown Android ABI: " + current_cpu) | 
|  251   } |  249   } | 
|  252 } |  250 } | 
| OLD | NEW |