| Index: build/toolchain/android/BUILD.gn
|
| diff --git a/build/toolchain/android/BUILD.gn b/build/toolchain/android/BUILD.gn
|
| index 4a1a29f7eef579b3f97f4c45e397d7966ae05b6a..f465a7c5cbb44d856c2998c2eb3d93313fccf93f 100644
|
| --- a/build/toolchain/android/BUILD.gn
|
| +++ b/build/toolchain/android/BUILD.gn
|
| @@ -59,6 +59,10 @@ template("android_gcc_toolchain") {
|
| # Don't use .cr.so for loadable_modules since they are always loaded via
|
| # absolute path.
|
| loadable_module_extension = ".so"
|
| +
|
| + if (defined(invoker.v8_toolchain_cpu)) {
|
| + v8_toolchain_cpu = invoker.v8_toolchain_cpu
|
| + }
|
| }
|
| }
|
|
|
| @@ -73,28 +77,54 @@ template("android_gcc_toolchains_helper") {
|
| }
|
| }
|
|
|
| -android_gcc_toolchains_helper("x86") {
|
| - toolchain_cpu = "x86"
|
| - toolchain_root = x86_android_toolchain_root
|
| - sysroot = "$android_ndk_root/$x86_android_sysroot_subdir"
|
| - lib_dir = "usr/lib"
|
| - binary_prefix = "i686-linux-android"
|
| +template("android_gcc_toolchains_x86_helper") {
|
| + android_gcc_toolchains_helper(target_name) {
|
| + toolchain_cpu = "x86"
|
| + toolchain_root = x86_android_toolchain_root
|
| + sysroot = "$android_ndk_root/$x86_android_sysroot_subdir"
|
| + lib_dir = "usr/lib"
|
| + binary_prefix = "i686-linux-android"
|
| + forward_variables_from(invoker, "*")
|
| + }
|
| }
|
|
|
| -android_gcc_toolchains_helper("arm") {
|
| - toolchain_cpu = "arm"
|
| - toolchain_root = arm_android_toolchain_root
|
| - sysroot = "$android_ndk_root/$arm_android_sysroot_subdir"
|
| - lib_dir = "usr/lib"
|
| - binary_prefix = "arm-linux-androideabi"
|
| +template("android_gcc_toolchains_arm_helper") {
|
| + android_gcc_toolchains_helper(target_name) {
|
| + toolchain_cpu = "arm"
|
| + toolchain_root = arm_android_toolchain_root
|
| + sysroot = "$android_ndk_root/$arm_android_sysroot_subdir"
|
| + lib_dir = "usr/lib"
|
| + binary_prefix = "arm-linux-androideabi"
|
| + forward_variables_from(invoker, "*")
|
| + }
|
| }
|
|
|
| -android_gcc_toolchains_helper("mipsel") {
|
| - toolchain_cpu = "mipsel"
|
| - toolchain_root = mips_android_toolchain_root
|
| - sysroot = "$android_ndk_root/$mips_android_sysroot_subdir"
|
| - lib_dir = "usr/lib"
|
| - binary_prefix = "mipsel-linux-android"
|
| +template("android_gcc_toolchains_mipsel_helper") {
|
| + android_gcc_toolchains_helper(target_name) {
|
| + toolchain_cpu = "mipsel"
|
| + toolchain_root = mips_android_toolchain_root
|
| + sysroot = "$android_ndk_root/$mips_android_sysroot_subdir"
|
| + lib_dir = "usr/lib"
|
| + binary_prefix = "mipsel-linux-android"
|
| + forward_variables_from(invoker, "*")
|
| + }
|
| +}
|
| +
|
| +android_gcc_toolchains_x86_helper("x86") {
|
| +}
|
| +
|
| +android_gcc_toolchains_arm_helper("arm") {
|
| +}
|
| +
|
| +android_gcc_toolchains_arm_helper("mipsel") {
|
| +}
|
| +
|
| +android_gcc_toolchains_arm_helper("arm_v8_arm") {
|
| + v8_toolchain_cpu = "arm"
|
| +}
|
| +
|
| +android_gcc_toolchains_arm_helper("mipsel_v8_mipsel") {
|
| + v8_toolchain_cpu = "mipsel"
|
| }
|
|
|
| android_gcc_toolchains_helper("x64") {
|
|
|