admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MB: Flip iOS bots to GN by default

Browse Source 
Change the previous GN configs to build GYP instead
(since we'll keep GYP around for a while) but exclude tests
and examples for that config, since we'll only support the production
code for GYP.

Add new configs for upcoming rename of those bots to GYP instead
of GN.

BUG=webrtc:5949
NOTRY=True
TBR=ehmaldonado@webrtc.org

Review-Url: https://codereview.webrtc.org/2291443002
Cr-Commit-Position: refs/heads/master@{#13980}
This commit is contained in:
kjellander 2016-08-30 14:05:44 -07:00 committed by Commit bot
parent d565b73121
commit 6e5b0d7a5b
21 changed files with 200 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
webrtc/build/ios/client.webrtc/iOS32_Debug.json
View File

@ -24,8 +24,9 @@
"goma_dir=\"$(goma_dir)\"",
"target_cpu=\"arm\""
],
"mb_type": "gyp",
"mb_type": "gn",
"compiler": "ninja",
"additional_compile_targets": [ "all" ],
"configuration": "Debug",
"sdk": "iphoneos9.0",
"tests": [

3
webrtc/build/ios/client.webrtc/iOS32_Release.json
View File

@ -24,8 +24,9 @@
"goma_dir=\"$(goma_dir)\"",
"target_cpu=\"arm\""
],
"mb_type": "gyp",
"mb_type": "gn",
"compiler": "ninja",
"additional_compile_targets": [ "all" ],
"configuration": "Release",
"sdk": "iphoneos9.0",
"tests": [

3
webrtc/build/ios/client.webrtc/iOS32_Simulator_Debug.json
View File

@ -24,8 +24,9 @@
"goma_dir=\"$(goma_dir)\"",
"target_cpu=\"x86\""
],
"mb_type": "gyp",
"mb_type": "gn",
"compiler": "ninja",
"additional_compile_targets": [ "all" ],
"configuration": "Debug",
"sdk": "iphonesimulator9.0",
"tests": [

3
webrtc/build/ios/client.webrtc/iOS64_Debug.json
View File

@ -24,8 +24,9 @@
"goma_dir=\"$(goma_dir)\"",
"target_cpu=\"arm64\""
],
"mb_type": "gyp",
"mb_type": "gn",
"compiler": "ninja",
"additional_compile_targets": [ "all" ],
"configuration": "Debug",
"sdk": "iphoneos9.0",
"tests": [

2
webrtc/build/ios/client.webrtc/iOS64_Debug_(GN).json
View File

@ -24,7 +24,7 @@
"goma_dir=\"$(goma_dir)\"",
"target_cpu=\"arm64\""
],
"mb_type": "gn",
"mb_type": "gyp",
"compiler": "ninja",
"additional_compile_targets": [ "all" ],
"configuration": "Debug",

34
webrtc/build/ios/client.webrtc/iOS64_Debug_(GYP).json Normal file
View File

@ -0,0 +1,34 @@
{
"owners": [
"kjellander"
],
"comments": [
"Builder for 64-bit devices.",
"GYP_DEFINES and gn_args in this file are only used during runhooks; ",
"webrtc/build/mb_config.pyl decides the generated projects that are compiled."
],
"xcode version": "7.0",
"GYP_DEFINES": [
"use_goma=1",
"gomadir=$(goma_dir)",
"chromium_ios_signing=0",
"component=static_library",
"target_arch=arm64"
],
"gn_args": [
"is_debug=true",
"target_os=\"ios\"",
"ios_enable_code_signing=false",
"is_component_build=false",
"use_goma=true",
"goma_dir=\"$(goma_dir)\"",
"target_cpu=\"arm64\""
],
"mb_type": "gyp",
"compiler": "ninja",
"additional_compile_targets": [ "all" ],
"configuration": "Debug",
"sdk": "iphoneos9.0",
"tests": [
]
}

3
webrtc/build/ios/client.webrtc/iOS64_Release.json
View File

@ -24,8 +24,9 @@
"goma_dir=\"$(goma_dir)\"",
"target_cpu=\"arm64\""
],
"mb_type": "gyp",
"mb_type": "gn",
"compiler": "ninja",
"additional_compile_targets": [ "all" ],
"configuration": "Release",
"sdk": "iphoneos9.0",
"tests": [

2
webrtc/build/ios/client.webrtc/iOS64_Release_(GN).json
View File

@ -24,7 +24,7 @@
"goma_dir=\"$(goma_dir)\"",
"target_cpu=\"arm64\""
],
"mb_type": "gn",
"mb_type": "gyp",
"compiler": "ninja",
"additional_compile_targets": [ "all" ],
"configuration": "Release",

34
webrtc/build/ios/client.webrtc/iOS64_Release_(GYP).json Normal file
View File

@ -0,0 +1,34 @@
{
"owners": [
"kjellander"
],
"comments": [
"Builder for 64-bit devices.",
"GYP_DEFINES and gn_args in this file are only used during runhooks; ",
"webrtc/build/mb_config.pyl decides the generated projects that are compiled."
],
"xcode version": "7.0",
"GYP_DEFINES": [
"use_goma=1",
"gomadir=$(goma_dir)",
"chromium_ios_signing=0",
"component=static_library",
"target_arch=arm64"
],
"gn_args": [
"is_debug=false",
"target_os=\"ios\"",
"ios_enable_code_signing=false",
"is_component_build=false",
"use_goma=true",
"goma_dir=\"$(goma_dir)\"",
"target_cpu=\"arm64\""
],
"mb_type": "gyp",
"compiler": "ninja",
"additional_compile_targets": [ "all" ],
"configuration": "Release",
"sdk": "iphoneos9.0",
"tests": [
]
}

3
webrtc/build/ios/client.webrtc/iOS64_Simulator_Debug.json
View File

@ -24,8 +24,9 @@
"goma_dir=\"$(goma_dir)\"",
"target_cpu=\"x64\""
],
"mb_type": "gyp",
"mb_type": "gn",
"compiler": "ninja",
"additional_compile_targets": [ "all" ],
"configuration": "Debug",
"sdk": "iphonesimulator9.0",
"tests": [

3
webrtc/build/ios/tryserver.webrtc/ios32_sim_dbg.json
View File

@ -24,9 +24,10 @@
"goma_dir=\"$(goma_dir)\"",
"target_cpu=\"x86\""
],
"mb_type": "gyp",
"mb_type": "gn",
"use_analyze": false,
"compiler": "ninja",
"additional_compile_targets": [ "all" ],
"configuration": "Debug",
"sdk": "iphonesimulator9.0",
"tests": [

2
webrtc/build/ios/tryserver.webrtc/ios64_gn_dbg.json
View File

@ -24,7 +24,7 @@
"goma_dir=\"$(goma_dir)\"",
"target_cpu=\"arm64\""
],
"mb_type": "gn",
"mb_type": "gyp",
"use_analyze": false,
"compiler": "ninja",
"additional_compile_targets": [ "all" ],

2
webrtc/build/ios/tryserver.webrtc/ios64_gn_rel.json
View File

@ -24,7 +24,7 @@
"goma_dir=\"$(goma_dir)\"",
"target_cpu=\"arm64\""
],
"mb_type": "gn",
"mb_type": "gyp",
"use_analyze": false,
"compiler": "ninja",
"additional_compile_targets": [ "all" ],

35
webrtc/build/ios/tryserver.webrtc/ios64_gyp_dbg.json Normal file
View File

@ -0,0 +1,35 @@
{
"owners": [
"kjellander"
],
"comments": [
"GN + Ninja builder.",
"GYP_DEFINES and gn_args in this file are only used during runhooks; ",
"webrtc/build/mb_config.pyl decides the generated projects that are compiled."
],
"xcode version": "7.0",
"GYP_DEFINES": [
"use_goma=1",
"gomadir=$(goma_dir)",
"chromium_ios_signing=0",
"component=static_library",
"target_arch=arm64"
],
"gn_args": [
"is_debug=true",
"target_os=\"ios\"",
"ios_enable_code_signing=false",
"is_component_build=false",
"use_goma=true",
"goma_dir=\"$(goma_dir)\"",
"target_cpu=\"arm64\""
],
"mb_type": "gyp",
"use_analyze": false,
"compiler": "ninja",
"additional_compile_targets": [ "all" ],
"configuration": "Debug",
"sdk": "iphoneos9.0",
"tests": [
]
}

35
webrtc/build/ios/tryserver.webrtc/ios64_gyp_rel.json Normal file
View File

@ -0,0 +1,35 @@
{
"owners": [
"kjellander"
],
"comments": [
"GN + Ninja builder.",
"GYP_DEFINES and gn_args in this file are only used during runhooks; ",
"webrtc/build/mb_config.pyl decides the generated projects that are compiled."
],
"xcode version": "7.0",
"GYP_DEFINES": [
"use_goma=1",
"gomadir=$(goma_dir)",
"chromium_ios_signing=0",
"component=static_library",
"target_arch=arm64"
],
"gn_args": [
"is_debug=false",
"target_os=\"ios\"",
"ios_enable_code_signing=false",
"is_component_build=false",
"use_goma=true",
"goma_dir=\"$(goma_dir)\"",
"target_cpu=\"arm64\""
],
"mb_type": "gyp",
"use_analyze": false,
"compiler": "ninja",
"additional_compile_targets": [ "all" ],
"configuration": "Release",
"sdk": "iphoneos9.0",
"tests": [
]
}

3
webrtc/build/ios/tryserver.webrtc/ios64_sim_dbg.json
View File

@ -24,9 +24,10 @@
"goma_dir=\"$(goma_dir)\"",
"target_cpu=\"x64\""
],
"mb_type": "gyp",
"mb_type": "gn",
"use_analyze": false,
"compiler": "ninja",
"additional_compile_targets": [ "all" ],
"configuration": "Debug",
"sdk": "iphonesimulator9.0",
"tests": [

3
webrtc/build/ios/tryserver.webrtc/ios_arm64_dbg.json
View File

@ -25,8 +25,9 @@
"target_cpu=\"arm64\""
],
"use_analyze": false,
"mb_type": "gyp",
"mb_type": "gn",
"compiler": "ninja",
"additional_compile_targets": [ "all" ],
"configuration": "Debug",
"sdk": "iphoneos9.0",
"tests": [

3
webrtc/build/ios/tryserver.webrtc/ios_arm64_rel.json
View File

@ -25,8 +25,9 @@
"target_cpu=\"arm64\""
],
"use_analyze": false,
"mb_type": "gyp",
"mb_type": "gn",
"compiler": "ninja",
"additional_compile_targets": [ "all" ],
"configuration": "Release",
"sdk": "iphoneos9.0",
"tests": [

3
webrtc/build/ios/tryserver.webrtc/ios_dbg.json
View File

@ -25,8 +25,9 @@
"target_cpu=\"arm\""
],
"use_analyze": false,
"mb_type": "gyp",
"mb_type": "gn",
"compiler": "ninja",
"additional_compile_targets": [ "all" ],
"configuration": "Debug",
"sdk": "iphoneos9.0",
"tests": [

3
webrtc/build/ios/tryserver.webrtc/ios_rel.json
View File

@ -25,8 +25,9 @@
"target_cpu=\"arm\""
],
"use_analyze": false,
"mb_type": "gyp",
"mb_type": "gn",
"compiler": "ninja",
"additional_compile_targets": [ "all" ],
"configuration": "Release",
"sdk": "iphoneos9.0",
"tests": [

60
webrtc/build/mb_config.pyl
View File

@ -20,14 +20,18 @@
'masters': {
'client.webrtc': {
# iOS
'iOS32 Debug': 'ios_gyp_debug_static_bot_arm_device',
'iOS32 Release': 'ios_gyp_release_bot_arm_device',
'iOS64 Debug': 'ios_gyp_debug_static_bot_arm64_device',
'iOS64 Release': 'ios_gyp_release_bot_arm64_device',
'iOS32 Simulator Debug': 'ios_gyp_debug_static_bot_x86',
'iOS64 Simulator Debug': 'ios_gyp_debug_static_bot_x64',
'iOS64 Debug (GN)': 'ios_gn_debug_static_bot_arm64_device',
'iOS64 Release (GN)': 'ios_gn_release_bot_arm64_device',
'iOS32 Debug': 'ios_gn_debug_static_bot_arm_device',
'iOS32 Release': 'ios_gn_release_bot_arm_device',
'iOS64 Debug': 'ios_gn_debug_static_bot_arm64_device',
'iOS64 Release': 'ios_gn_release_bot_arm64_device',
'iOS32 Simulator Debug': 'ios_gn_debug_static_bot_x86',
'iOS64 Simulator Debug': 'ios_gn_debug_static_bot_x64',
# TODO(kjellander): Remove the two GN configs below as soon we've renamed
# the bots to the GYP versions (duplicated now).
'iOS64 Debug (GN)': 'ios_gyp_debug_static_bot_arm64_device',
'iOS64 Release (GN)': 'ios_gyp_release_bot_arm64_device',
'iOS64 Debug (GYP)': 'ios_gyp_debug_static_bot_arm64_device',
'iOS64 Release (GYP)': 'ios_gyp_release_bot_arm64_device',
# Mac
'Mac64 Debug': 'gn_debug_bot_x64',
@ -103,14 +107,18 @@
},
'tryserver.webrtc': {
# iOS
'ios_dbg': 'ios_gyp_debug_static_bot_arm_device',
'ios_rel': 'ios_gyp_release_bot_arm_device',
'ios_arm64_dbg': 'ios_gyp_debug_static_bot_arm64_device',
'ios_arm64_rel': 'ios_gyp_release_bot_arm64_device',
'ios32_sim_dbg': 'ios_gyp_debug_static_bot_x86',
'ios64_sim_dbg': 'ios_gyp_debug_static_bot_x64',
'ios64_gn_dbg': 'ios_gn_debug_static_bot_arm64_device',
'ios64_gn_rel': 'ios_gn_release_bot_arm64_device',
'ios_dbg': 'ios_gn_debug_static_bot_arm_device',
'ios_rel': 'ios_gn_release_bot_arm_device',
'ios_arm64_dbg': 'ios_gn_debug_static_bot_arm64_device',
'ios_arm64_rel': 'ios_gn_release_bot_arm64_device',
'ios32_sim_dbg': 'ios_gn_debug_static_bot_x86',
'ios64_sim_dbg': 'ios_gn_debug_static_bot_x64',
# TODO(kjellander): Remove the two GN configs below as soon we've renamed
# the bots to the GYP versions (duplicated now).
'ios64_gn_dbg': 'ios_gyp_debug_static_bot_arm64_device',
'ios64_gn_rel': 'ios_gyp_release_bot_arm64_device',
'ios64_gyp_dbg': 'ios_gyp_debug_static_bot_arm64_device',
'ios64_gyp_rel': 'ios_gyp_release_bot_arm64_device',
# Mac
'mac_compile_dbg': 'gn_debug_bot_x64',
@ -209,11 +217,17 @@
'ios_gn_release_bot_arm64_device': [
'ios', 'gn', 'release_bot', 'arm64', 'device'
],
'ios_gyp_debug_static_bot_arm_device': [
'ios', 'gyp', 'debug_static_bot', 'arm', 'device'
'ios_gn_debug_static_bot_arm_device': [
'ios', 'gn', 'debug_static_bot', 'arm', 'device'
],
'ios_gyp_release_bot_arm_device': [
'ios', 'gyp', 'release_bot', 'arm', 'device'
'ios_gn_release_bot_arm_device': [
'ios', 'gn', 'release_bot', 'arm', 'device'
],
'ios_gn_debug_static_bot_x86': [
'ios', 'gn', 'debug_static_bot', 'x86'
],
'ios_gn_debug_static_bot_x64': [
'ios', 'gn', 'debug_static_bot', 'x64'
],
'ios_gyp_debug_static_bot_arm64_device': [
'ios', 'gyp', 'debug_static_bot', 'arm64', 'device'
@ -221,12 +235,6 @@
'ios_gyp_release_bot_arm64_device': [
'ios', 'gyp', 'release_bot', 'arm64', 'device'
],
'ios_gyp_debug_static_bot_x86': [
'ios', 'gyp', 'debug_static_bot', 'x86'
],
'ios_gyp_debug_static_bot_x64': [
'ios', 'gyp', 'release_bot', 'x64'
],
# Linux, Mac and Windows
'gn_crosscompile_release_bot_arm': [