Skip to content

GitLab

T
tangled
Commit 93c0393e authored by rmcilroy@chromium.org's avatar rmcilroy@chromium.org
Browse files
Options

[Android]: Update Arm64 and x86_64 build targets to use the experimental ndk. 

BUG=354405,346626

Review URL: https://codereview.chromium.org/225093007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262969 0039d316-1c4b-4281-b951-d872f2087c98
parent 8658b2e6
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 13 deletions
build/common.gypi
View file @ 93c0393e
......@@ -1489,6 +1489,7 @@
# they're passed to ant which uses a different relative path from
# gyp.
'android_ndk_root%': '<!(cd <(DEPTH) && pwd -P)/third_party/android_tools/ndk/',
'android_ndk_experimental_root%': '<!(cd <(DEPTH) && pwd -P)/third_party/android_tools/ndk_experimental/',
'android_sdk_root%': '<!(cd <(DEPTH) && pwd -P)/third_party/android_tools/sdk/',
'android_host_arch%': '<!(uname -m)',
# Android API-level of the SDK used for compilation.
......@@ -1513,17 +1514,16 @@
'conditions': [
['target_arch == "ia32"', {
'android_app_abi%': 'x86',
'android_gdbserver_executable%': 'gdbserver',
'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-x86/gdbserver/gdbserver',
'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-14/arch-x86',
'android_toolchain%': '<(android_ndk_root)/toolchains/x86-4.6/prebuilt/<(host_os)-<(android_host_arch)/bin',
}],
['target_arch == "x64"', {
'android_app_abi%': 'x86_64',
'android_gdbserver_executable%': 'gdbserver64',
'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-x86_64/gdbserver/gdbserver64',
'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-19/arch-x86_64',
'android_toolchain%': '<(android_ndk_root)/toolchains/x86_64-4.8/prebuilt/<(host_os)-<(android_host_arch)/bin',
'android_gdbserver%': '<(android_ndk_experimental_root)/prebuilt/android-x86_64/gdbserver/gdbserver',
'android_ndk_sysroot%': '<(android_ndk_experimental_root)/platforms/android-20/arch-x86_64',
'android_toolchain%': '<(android_ndk_experimental_root)/toolchains/x86_64-4.8/prebuilt/<(host_os)-<(android_host_arch)/bin',
'android_stlport_root': '<(android_ndk_experimental_root)/sources/cxx-stl/stlport',
}],
['target_arch=="arm"', {
'conditions': [
......@@ -1533,21 +1533,19 @@
'android_app_abi%': 'armeabi-v7a',
}],
],
'android_gdbserver_executable%': 'gdbserver',
'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-arm/gdbserver/gdbserver',
'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-14/arch-arm',
'android_toolchain%': '<(android_ndk_root)/toolchains/arm-linux-androideabi-4.6/prebuilt/<(host_os)-<(android_host_arch)/bin',
}],
['target_arch == "arm64"', {
'android_app_abi%': 'arm64-v8a',
'android_gdbserver_executable%': 'gdbserver64',
'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-arm64/gdbserver64/gdbserver64',
'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-19/arch-arm64',
'android_toolchain%': '<(android_ndk_root)/toolchains/aarch64-linux-android-4.8/prebuilt/<(host_os)-<(android_host_arch)/bin',
'android_gdbserver%': '<(android_ndk_experimental_root)/prebuilt/android-arm64/gdbserver/gdbserver',
'android_ndk_sysroot%': '<(android_ndk_experimental_root)/platforms/android-20/arch-arm64',
'android_toolchain%': '<(android_ndk_experimental_root)/toolchains/aarch64-linux-android-4.8/prebuilt/<(host_os)-<(android_host_arch)/bin',
'android_stlport_root': '<(android_ndk_experimental_root)/sources/cxx-stl/stlport',
}],
['target_arch == "mipsel"', {
'android_app_abi%': 'mips',
'android_gdbserver_executable%': 'gdbserver',
'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-mips/gdbserver/gdbserver',
'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-14/arch-mips',
'android_toolchain%': '<(android_ndk_root)/toolchains/mipsel-linux-android-4.6/prebuilt/<(host_os)-<(android_host_arch)/bin',
......@@ -1556,7 +1554,6 @@
},
# Copy conditionally-set variables out one scope.
'android_app_abi%': '<(android_app_abi)',
'android_gdbserver_executable': '<(android_gdbserver_executable)',
'android_gdbserver%': '<(android_gdbserver)',
'android_ndk_root%': '<(android_ndk_root)',
'android_ndk_sysroot%': '<(android_ndk_sysroot)',
......
build/java_apk.gypi
View file @ 93c0393e
......@@ -188,7 +188,7 @@
'<(SHARED_LIB_DIR)/<(native_lib_target).>(android_product_extension)'
],
'package_input_paths': [
'<(apk_package_native_libs_dir)/<(android_app_abi)/<(android_gdbserver_executable)',
'<(apk_package_native_libs_dir)/<(android_app_abi)/gdbserver',
],
},
'copies': [
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment