Commit 45fe9019 authored by machenbach's avatar machenbach Committed by Commit bot

[gn] Switch android bots to gn

Also roll build and android_tools, which contains a bump of
the ndk to r12b.

BUG=chromium:629806

Review-Url: https://codereview.chromium.org/2320843003
Cr-Commit-Position: refs/heads/master@{#39269}
parent 7dd7d925
......@@ -8,7 +8,7 @@ vars = {
deps = {
"v8/build":
Var("git_url") + "/chromium/src/build.git" + "@" + "464a8fa0e414f18a55f20f2a6981778f105060da",
Var("git_url") + "/chromium/src/build.git" + "@" + "166aec3a7c2d01ac60a4921a494f9c9139454243",
"v8/tools/gyp":
Var("git_url") + "/external/gyp.git" + "@" + "702ac58e477214c635d9b541932e75a95d349352",
"v8/third_party/icu":
......@@ -47,7 +47,7 @@ deps = {
deps_os = {
"android": {
"v8/third_party/android_tools":
Var("git_url") + "/android_tools.git" + "@" + "af1c5a4cd6329ccdcf8c2bc93d9eea02f9d74869",
Var("git_url") + "/android_tools.git" + "@" + "25d57ead05d3dfef26e9c19b13ed10b0a69829cf",
},
"win": {
"v8/third_party/cygwin":
......
......@@ -320,7 +320,7 @@
'android_ndk_root%': '<(base_dir)/third_party/android_tools/ndk/',
'android_host_arch%': "<!(uname -m | sed -e 's/i[3456]86/x86/')",
# Version of the NDK. Used to ensure full rebuilds on NDK rolls.
'android_ndk_version%': 'r11c',
'android_ndk_version%': 'r12b',
'host_os%': "<!(uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/')",
'os_folder_name%': "<!(uname -s | sed -e 's/Linux/linux/;s/Darwin/darwin/')",
},
......
......@@ -95,11 +95,11 @@
# Arm.
'V8 Arm - builder': 'gyp_release_arm',
'V8 Arm - debug builder': 'gyp_debug_arm',
'V8 Android Arm - builder': 'gyp_release_android_arm',
'V8 Android Arm - builder': 'gn_release_android_arm',
'V8 Linux - arm - sim': 'gn_release_simulate_arm',
'V8 Linux - arm - sim - debug': 'gn_debug_simulate_arm',
# Arm64.
'V8 Android Arm64 - builder': 'gyp_release_android_arm64',
'V8 Android Arm64 - builder': 'gn_release_android_arm64',
'V8 Linux - arm64 - sim': 'gn_release_simulate_arm64',
'V8 Linux - arm64 - sim - debug': 'gn_debug_simulate_arm64',
'V8 Linux - arm64 - sim - nosnap - debug':
......@@ -187,7 +187,7 @@
'v8_linux_arm64_gc_stress_dbg': 'gn_debug_simulate_arm64',
'v8_linux_mipsel_compile_rel': 'gyp_release_simulate_mipsel',
'v8_linux_mips64el_compile_rel': 'gyp_release_simulate_mips64el',
'v8_android_arm_compile_rel': 'gyp_release_android_arm',
'v8_android_arm_compile_rel': 'gn_release_android_arm',
},
},
......@@ -247,6 +247,12 @@
'gn_release_simulate_arm64_trybot': [
'gn', 'release_trybot', 'simulate_arm64', 'swarming'],
# GN release configs for arm.
'gn_release_android_arm': [
'gn', 'release_bot', 'arm', 'android', 'crosscompile', 'swarming'],
'gn_release_android_arm64': [
'gn', 'release_bot', 'arm64', 'android', 'crosscompile', 'swarming'],
# GN release configs for x64.
'gn_release_x64': [
'gn', 'release_bot', 'x64', 'swarming'],
......@@ -351,10 +357,6 @@
# Gyp release configs for arm.
'gyp_release_arm': [
'gyp', 'release_bot', 'arm', 'crosscompile', 'hard_float', 'swarming'],
'gyp_release_android_arm': [
'gyp', 'release_bot', 'arm', 'android', 'crosscompile', 'swarming'],
'gyp_release_android_arm64': [
'gyp', 'release_bot', 'arm64', 'android', 'crosscompile', 'swarming'],
# Gyp release configs for mips.
'gyp_release_mips_no_snap_no_i18n': [
......
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