| Index: build/config/android/config.gni
|
| diff --git a/build/config/android/config.gni b/build/config/android/config.gni
|
| index ce9a175e73d43e5191c9303f466900fcbe092e6d..99abf956c085049bc9c75a4eb9006b815a28075a 100644
|
| --- a/build/config/android/config.gni
|
| +++ b/build/config/android/config.gni
|
| @@ -5,9 +5,10 @@
|
| # This file contains common system config stuff for the Android build.
|
|
|
| if (is_android) {
|
| - has_chrome_android_internal = exec_script("//build/dir_exists.py",
|
| - [ rebase_path("//clank", root_build_dir) ],
|
| - "string") == "True"
|
| + has_chrome_android_internal =
|
| + exec_script("//build/dir_exists.py",
|
| + [ rebase_path("//clank", root_build_dir) ],
|
| + "string") == "True"
|
|
|
| if (has_chrome_android_internal) {
|
| import("//clank/config.gni")
|
| @@ -27,7 +28,8 @@ if (is_android) {
|
| # when this is unset, but builds using the normal chromium build system.
|
| is_android_webview_build = false
|
|
|
| - android_default_keystore_path = "//build/android/ant/chromium-debug.keystore"
|
| + android_default_keystore_path =
|
| + "//build/android/ant/chromium-debug.keystore"
|
| android_default_keystore_name = "chromiumdebugkey"
|
| android_default_keystore_password = "chromium"
|
|
|
| @@ -89,7 +91,8 @@ if (is_android) {
|
| android_sdk = "${android_sdk_root}/platforms/android-${android_sdk_version}"
|
|
|
| android_sdk_tools = "${android_sdk_root}/tools"
|
| - android_sdk_build_tools = "${android_sdk_root}/build-tools/$android_sdk_build_tools_version"
|
| + android_sdk_build_tools =
|
| + "${android_sdk_root}/build-tools/$android_sdk_build_tools_version"
|
|
|
| # Path to the SDK's android.jar
|
| android_sdk_jar = "$android_sdk/android.jar"
|
| @@ -99,16 +102,22 @@ if (is_android) {
|
| # Subdirectories inside android_ndk_root that contain the sysroot for the
|
| # associated platform.
|
| _android_api_level = 14
|
| - x86_android_sysroot_subdir = "platforms/android-${_android_api_level}/arch-x86"
|
| - arm_android_sysroot_subdir = "platforms/android-${_android_api_level}/arch-arm"
|
| - mips_android_sysroot_subdir = "platforms/android-${_android_api_level}/arch-mips"
|
| + x86_android_sysroot_subdir =
|
| + "platforms/android-${_android_api_level}/arch-x86"
|
| + arm_android_sysroot_subdir =
|
| + "platforms/android-${_android_api_level}/arch-arm"
|
| + mips_android_sysroot_subdir =
|
| + "platforms/android-${_android_api_level}/arch-mips"
|
|
|
| # Toolchain root directory for each build. The actual binaries are inside
|
| # a "bin" directory inside of these.
|
| _android_toolchain_version = "4.9"
|
| - x86_android_toolchain_root = "$android_ndk_root/toolchains/x86-${_android_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch}"
|
| - arm_android_toolchain_root = "$android_ndk_root/toolchains/arm-linux-androideabi-${_android_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch}"
|
| - mips_android_toolchain_root = "$android_ndk_root/toolchains/mipsel-linux-android-${_android_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch}"
|
| + x86_android_toolchain_root =
|
| + "$android_ndk_root/toolchains/x86-${_android_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch}"
|
| + arm_android_toolchain_root =
|
| + "$android_ndk_root/toolchains/arm-linux-androideabi-${_android_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch}"
|
| + mips_android_toolchain_root =
|
| + "$android_ndk_root/toolchains/mipsel-linux-android-${_android_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch}"
|
|
|
| # Location of libgcc. This is only needed for the current GN toolchain, so we
|
| # only need to define the current one, rather than one for every platform
|
| @@ -118,24 +127,24 @@ if (is_android) {
|
| _binary_prefix = "i686-linux-android"
|
| android_toolchain_root = "$x86_android_toolchain_root"
|
| android_libgcc_file =
|
| - "$android_toolchain_root/lib/gcc/i686-linux-android/${_android_toolchain_version}/libgcc.a"
|
| + "$android_toolchain_root/lib/gcc/i686-linux-android/${_android_toolchain_version}/libgcc.a"
|
| } else if (cpu_arch == "arm") {
|
| 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"
|
| + "$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_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"
|
| android_toolchain_root = "$mips_android_toolchain_root"
|
| android_libgcc_file =
|
| - "$android_toolchain_root/lib/gcc/mipsel-linux-android/${_android_toolchain_version}/libgcc.a"
|
| + "$android_toolchain_root/lib/gcc/mipsel-linux-android/${_android_toolchain_version}/libgcc.a"
|
| } else {
|
| assert(false, "Need android libgcc support for your target arch.")
|
| }
|
| @@ -143,7 +152,8 @@ if (is_android) {
|
| android_tool_prefix = "$android_toolchain_root/bin/$_binary_prefix-"
|
| android_readelf = "${android_tool_prefix}readelf"
|
| android_objcopy = "${android_tool_prefix}objcopy"
|
| - android_gdbserver = "$android_ndk_root/prebuilt/$android_prebuilt_arch/gdbserver/gdbserver"
|
| + android_gdbserver =
|
| + "$android_ndk_root/prebuilt/$android_prebuilt_arch/gdbserver/gdbserver"
|
|
|
| # stlport stuff --------------------------------------------------------------
|
|
|
|
|