From 1c814e7b72ddfb98b1719a1acdba9b10734d930b Mon Sep 17 00:00:00 2001 From: kjellander Date: Tue, 16 Aug 2016 02:42:02 -0700 Subject: [PATCH] iOS: Update MB and JSON configs + enable Goma Turns out that if mb_type is missing in the JSON, GYP is run the traditional way instead of having the MB configuration decide. This turns on MB for those builders. See https://codereview.chromium.org/2194703002 for how Chromium switched from GYP->GN. The JSON environment for GYP and GN is only used during runhooks step since there are scripts that key on some of these environment variables. The actual build that is compiled is defined by the MB config, which is now updated to have component=static_library everywhere for iOS. With this CL, all configs gets a full GYP+GN environment. When flipping bots over to GN, the following line will need to be added in addition to changing mb_type: "additional_compile_targets": [ "all" ], Goma was also enabled for all builders to reduce compile time. BUG=589510 NOTRY=True Review-Url: https://codereview.webrtc.org/2239643002 Cr-Commit-Position: refs/heads/master@{#13775} --- .../build/ios/client.webrtc/iOS32_Debug.json | 25 +++++++-- .../ios/client.webrtc/iOS32_Release.json | 25 +++++++-- .../client.webrtc/iOS32_Simulator_Debug.json | 25 +++++++-- .../build/ios/client.webrtc/iOS64_Debug.json | 25 +++++++-- .../ios/client.webrtc/iOS64_Debug_(GN).json | 24 ++++++--- .../ios/client.webrtc/iOS64_Release.json | 25 +++++++-- .../ios/client.webrtc/iOS64_Release_(GN).json | 24 ++++++--- .../client.webrtc/iOS64_Simulator_Debug.json | 25 +++++++-- .../ios/tryserver.webrtc/ios32_sim_dbg.json | 25 +++++++-- .../ios/tryserver.webrtc/ios64_gn_dbg.json | 24 ++++++--- .../ios/tryserver.webrtc/ios64_gn_rel.json | 24 ++++++--- .../ios/tryserver.webrtc/ios64_sim_dbg.json | 25 +++++++-- .../ios/tryserver.webrtc/ios_arm64_dbg.json | 25 +++++++-- .../ios/tryserver.webrtc/ios_arm64_rel.json | 25 +++++++-- .../build/ios/tryserver.webrtc/ios_dbg.json | 25 +++++++-- .../build/ios/tryserver.webrtc/ios_rel.json | 25 +++++++-- webrtc/build/mb_config.pyl | 54 ++++++++----------- 17 files changed, 331 insertions(+), 119 deletions(-) diff --git a/webrtc/build/ios/client.webrtc/iOS32_Debug.json b/webrtc/build/ios/client.webrtc/iOS32_Debug.json index c6c068387d..1565d084e1 100644 --- a/webrtc/build/ios/client.webrtc/iOS32_Debug.json +++ b/webrtc/build/ios/client.webrtc/iOS32_Debug.json @@ -3,13 +3,28 @@ "kjellander" ], "comments": [ - "Builder for 32-bit devices." + "Builder for 32-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": { - "chromium_ios_signing": "0", - "target_arch": "arm" - }, + "GYP_DEFINES": [ + "use_goma=1", + "gomadir=$(goma_dir)", + "chromium_ios_signing=0", + "component=static_library", + "target_arch=arm" + ], + "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=\"arm\"" + ], + "mb_type": "gyp", "compiler": "ninja", "configuration": "Debug", "sdk": "iphoneos9.0", diff --git a/webrtc/build/ios/client.webrtc/iOS32_Release.json b/webrtc/build/ios/client.webrtc/iOS32_Release.json index cacc11fe79..01b27976a8 100644 --- a/webrtc/build/ios/client.webrtc/iOS32_Release.json +++ b/webrtc/build/ios/client.webrtc/iOS32_Release.json @@ -3,13 +3,28 @@ "kjellander" ], "comments": [ - "Builder for 32-bit devices." + "Builder for 32-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": { - "chromium_ios_signing": "0", - "target_arch": "arm" - }, + "GYP_DEFINES": [ + "use_goma=1", + "gomadir=$(goma_dir)", + "chromium_ios_signing=0", + "component=static_library", + "target_arch=arm" + ], + "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=\"arm\"" + ], + "mb_type": "gyp", "compiler": "ninja", "configuration": "Release", "sdk": "iphoneos9.0", diff --git a/webrtc/build/ios/client.webrtc/iOS32_Simulator_Debug.json b/webrtc/build/ios/client.webrtc/iOS32_Simulator_Debug.json index 516eeafd41..c76977891e 100644 --- a/webrtc/build/ios/client.webrtc/iOS32_Simulator_Debug.json +++ b/webrtc/build/ios/client.webrtc/iOS32_Simulator_Debug.json @@ -3,13 +3,28 @@ "kjellander" ], "comments": [ - "Tests for 32-bit iOS 9.0 simulators." + "Tests for 32-bit iOS 9.0 simulators.", + "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": { - "chromium_ios_signing": "0", - "target_arch": "ia32" - }, + "GYP_DEFINES": [ + "use_goma=1", + "gomadir=$(goma_dir)", + "chromium_ios_signing=0", + "component=static_library", + "target_arch=ia32" + ], + "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=\"x86\"" + ], + "mb_type": "gyp", "compiler": "ninja", "configuration": "Debug", "sdk": "iphonesimulator9.0", diff --git a/webrtc/build/ios/client.webrtc/iOS64_Debug.json b/webrtc/build/ios/client.webrtc/iOS64_Debug.json index 657ba91252..338c589cca 100644 --- a/webrtc/build/ios/client.webrtc/iOS64_Debug.json +++ b/webrtc/build/ios/client.webrtc/iOS64_Debug.json @@ -3,13 +3,28 @@ "kjellander" ], "comments": [ - "Builder for 64-bit devices." + "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": { - "chromium_ios_signing": "0", - "target_arch": "arm64" - }, + "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", "configuration": "Debug", "sdk": "iphoneos9.0", diff --git a/webrtc/build/ios/client.webrtc/iOS64_Debug_(GN).json b/webrtc/build/ios/client.webrtc/iOS64_Debug_(GN).json index eefcdd19f4..d72245b99c 100644 --- a/webrtc/build/ios/client.webrtc/iOS64_Debug_(GN).json +++ b/webrtc/build/ios/client.webrtc/iOS64_Debug_(GN).json @@ -3,20 +3,30 @@ "kjellander" ], "comments": [ - "GN + Ninja builder." + "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": { - "chromium_ios_signing": "0", - "target_arch": "arm64" - }, + "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", - "target_cpu=\"arm\"", - "target_os=\"ios\"" + "is_component_build=false", + "use_goma=true", + "goma_dir=\"$(goma_dir)\"", + "target_cpu=\"arm64\"" ], "mb_type": "gn", "compiler": "ninja", + "additional_compile_targets": [ "all" ], "configuration": "Debug", "sdk": "iphoneos9.0", "tests": [ diff --git a/webrtc/build/ios/client.webrtc/iOS64_Release.json b/webrtc/build/ios/client.webrtc/iOS64_Release.json index 097a1b13de..e6927ef541 100644 --- a/webrtc/build/ios/client.webrtc/iOS64_Release.json +++ b/webrtc/build/ios/client.webrtc/iOS64_Release.json @@ -3,13 +3,28 @@ "kjellander" ], "comments": [ - "Builder for 64-bit devices." + "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": { - "chromium_ios_signing": "0", - "target_arch": "arm64" - }, + "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", "configuration": "Release", "sdk": "iphoneos9.0", diff --git a/webrtc/build/ios/client.webrtc/iOS64_Release_(GN).json b/webrtc/build/ios/client.webrtc/iOS64_Release_(GN).json index bb324118a7..f67d358d07 100644 --- a/webrtc/build/ios/client.webrtc/iOS64_Release_(GN).json +++ b/webrtc/build/ios/client.webrtc/iOS64_Release_(GN).json @@ -3,20 +3,30 @@ "kjellander" ], "comments": [ - "GN + Ninja builder." + "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": { - "chromium_ios_signing": "0", - "target_arch": "arm64" - }, + "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", - "target_cpu=\"arm\"", - "target_os=\"ios\"" + "is_component_build=false", + "use_goma=true", + "goma_dir=\"$(goma_dir)\"", + "target_cpu=\"arm64\"" ], "mb_type": "gn", "compiler": "ninja", + "additional_compile_targets": [ "all" ], "configuration": "Release", "sdk": "iphoneos9.0", "tests": [ diff --git a/webrtc/build/ios/client.webrtc/iOS64_Simulator_Debug.json b/webrtc/build/ios/client.webrtc/iOS64_Simulator_Debug.json index c997b5241e..14b93884dd 100644 --- a/webrtc/build/ios/client.webrtc/iOS64_Simulator_Debug.json +++ b/webrtc/build/ios/client.webrtc/iOS64_Simulator_Debug.json @@ -3,13 +3,28 @@ "kjellander" ], "comments": [ - "Tests for 32-bit iOS 9.0 simulators." + "Tests for 32-bit iOS 9.0 simulators.", + "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": { - "chromium_ios_signing": "0", - "target_arch": "x64" - }, + "GYP_DEFINES": [ + "use_goma=1", + "gomadir=$(goma_dir)", + "chromium_ios_signing=0", + "component=static_library", + "target_arch=x64" + ], + "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=\"x64\"" + ], + "mb_type": "gyp", "compiler": "ninja", "configuration": "Debug", "sdk": "iphonesimulator9.0", diff --git a/webrtc/build/ios/tryserver.webrtc/ios32_sim_dbg.json b/webrtc/build/ios/tryserver.webrtc/ios32_sim_dbg.json index 9469f7e8d2..a915fdbcb4 100644 --- a/webrtc/build/ios/tryserver.webrtc/ios32_sim_dbg.json +++ b/webrtc/build/ios/tryserver.webrtc/ios32_sim_dbg.json @@ -3,13 +3,28 @@ "kjellander" ], "comments": [ - "Tests for 32-bit iOS 9.0 simulators." + "Tests for 32-bit iOS 9.0 simulators.", + "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": { - "chromium_ios_signing": "0", - "target_arch": "ia32" - }, + "GYP_DEFINES": [ + "use_goma=1", + "gomadir=$(goma_dir)", + "chromium_ios_signing=0", + "component=static_library", + "target_arch=ia32" + ], + "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=\"x86\"" + ], + "mb_type": "gyp", "use_analyze": false, "compiler": "ninja", "configuration": "Debug", diff --git a/webrtc/build/ios/tryserver.webrtc/ios64_gn_dbg.json b/webrtc/build/ios/tryserver.webrtc/ios64_gn_dbg.json index 138d13f1a9..e53856683c 100644 --- a/webrtc/build/ios/tryserver.webrtc/ios64_gn_dbg.json +++ b/webrtc/build/ios/tryserver.webrtc/ios64_gn_dbg.json @@ -3,21 +3,31 @@ "kjellander" ], "comments": [ - "GN + Ninja builder." + "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": { - "chromium_ios_signing": "0", - "target_arch": "arm64" - }, + "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", - "target_cpu=\"arm\"", - "target_os=\"ios\"" + "is_component_build=false", + "use_goma=true", + "goma_dir=\"$(goma_dir)\"", + "target_cpu=\"arm64\"" ], "mb_type": "gn", "use_analyze": false, "compiler": "ninja", + "additional_compile_targets": [ "all" ], "configuration": "Debug", "sdk": "iphoneos9.0", "tests": [ diff --git a/webrtc/build/ios/tryserver.webrtc/ios64_gn_rel.json b/webrtc/build/ios/tryserver.webrtc/ios64_gn_rel.json index 97c680ff34..9cc49c21ac 100644 --- a/webrtc/build/ios/tryserver.webrtc/ios64_gn_rel.json +++ b/webrtc/build/ios/tryserver.webrtc/ios64_gn_rel.json @@ -3,21 +3,31 @@ "kjellander" ], "comments": [ - "GN + Ninja builder." + "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": { - "chromium_ios_signing": "0", - "target_arch": "arm64" - }, + "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", - "target_cpu=\"arm\"", - "target_os=\"ios\"" + "is_component_build=false", + "use_goma=true", + "goma_dir=\"$(goma_dir)\"", + "target_cpu=\"arm64\"" ], "mb_type": "gn", "use_analyze": false, "compiler": "ninja", + "additional_compile_targets": [ "all" ], "configuration": "Release", "sdk": "iphoneos9.0", "tests": [ diff --git a/webrtc/build/ios/tryserver.webrtc/ios64_sim_dbg.json b/webrtc/build/ios/tryserver.webrtc/ios64_sim_dbg.json index 038d7d9f1d..780a8cc295 100644 --- a/webrtc/build/ios/tryserver.webrtc/ios64_sim_dbg.json +++ b/webrtc/build/ios/tryserver.webrtc/ios64_sim_dbg.json @@ -3,13 +3,28 @@ "kjellander" ], "comments": [ - "Tests for 32-bit iOS 9.0 simulators." + "Tests for 64-bit iOS 9.0 simulators.", + "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": { - "chromium_ios_signing": "0", - "target_arch": "x64" - }, + "GYP_DEFINES": [ + "use_goma=1", + "gomadir=$(goma_dir)", + "chromium_ios_signing=0", + "component=static_library", + "target_arch=x64" + ], + "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=\"x64\"" + ], + "mb_type": "gyp", "use_analyze": false, "compiler": "ninja", "configuration": "Debug", diff --git a/webrtc/build/ios/tryserver.webrtc/ios_arm64_dbg.json b/webrtc/build/ios/tryserver.webrtc/ios_arm64_dbg.json index 43f39e2858..629af7a2e4 100644 --- a/webrtc/build/ios/tryserver.webrtc/ios_arm64_dbg.json +++ b/webrtc/build/ios/tryserver.webrtc/ios_arm64_dbg.json @@ -3,14 +3,29 @@ "kjellander" ], "comments": [ - "Builder for 64-bit devices." + "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": { - "chromium_ios_signing": "0", - "target_arch": "arm64" - }, + "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\"" + ], "use_analyze": false, + "mb_type": "gyp", "compiler": "ninja", "configuration": "Debug", "sdk": "iphoneos9.0", diff --git a/webrtc/build/ios/tryserver.webrtc/ios_arm64_rel.json b/webrtc/build/ios/tryserver.webrtc/ios_arm64_rel.json index 839aa731a7..77ca520fe9 100644 --- a/webrtc/build/ios/tryserver.webrtc/ios_arm64_rel.json +++ b/webrtc/build/ios/tryserver.webrtc/ios_arm64_rel.json @@ -3,14 +3,29 @@ "kjellander" ], "comments": [ - "Builder for 64-bit devices." + "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": { - "chromium_ios_signing": "0", - "target_arch": "arm64" - }, + "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\"" + ], "use_analyze": false, + "mb_type": "gyp", "compiler": "ninja", "configuration": "Release", "sdk": "iphoneos9.0", diff --git a/webrtc/build/ios/tryserver.webrtc/ios_dbg.json b/webrtc/build/ios/tryserver.webrtc/ios_dbg.json index f468c9cb6e..31fb57729b 100644 --- a/webrtc/build/ios/tryserver.webrtc/ios_dbg.json +++ b/webrtc/build/ios/tryserver.webrtc/ios_dbg.json @@ -3,14 +3,29 @@ "kjellander" ], "comments": [ - "Builder for 32-bit devices." + "Builder for 32-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": { - "chromium_ios_signing": "0", - "target_arch": "arm" - }, + "GYP_DEFINES": [ + "use_goma=1", + "gomadir=$(goma_dir)", + "chromium_ios_signing=0", + "component=static_library", + "target_arch=arm" + ], + "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=\"arm\"" + ], "use_analyze": false, + "mb_type": "gyp", "compiler": "ninja", "configuration": "Debug", "sdk": "iphoneos9.0", diff --git a/webrtc/build/ios/tryserver.webrtc/ios_rel.json b/webrtc/build/ios/tryserver.webrtc/ios_rel.json index c07787298a..f669e29722 100644 --- a/webrtc/build/ios/tryserver.webrtc/ios_rel.json +++ b/webrtc/build/ios/tryserver.webrtc/ios_rel.json @@ -3,14 +3,29 @@ "kjellander" ], "comments": [ - "Builder for 32-bit devices." + "Builder for 32-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": { - "chromium_ios_signing": "0", - "target_arch": "arm" - }, + "GYP_DEFINES": [ + "use_goma=1", + "gomadir=$(goma_dir)", + "chromium_ios_signing=0", + "component=static_library", + "target_arch=arm" + ], + "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=\"arm\"" + ], "use_analyze": false, + "mb_type": "gyp", "compiler": "ninja", "configuration": "Release", "sdk": "iphoneos9.0", diff --git a/webrtc/build/mb_config.pyl b/webrtc/build/mb_config.pyl index 8271a4792c..99e1433c6d 100644 --- a/webrtc/build/mb_config.pyl +++ b/webrtc/build/mb_config.pyl @@ -20,13 +20,13 @@ 'masters': { 'client.webrtc': { # iOS - 'iOS32 Debug': 'ios_gyp_debug_bot_arm_device', + 'iOS32 Debug': 'ios_gyp_debug_static_bot_arm_device', 'iOS32 Release': 'ios_gyp_release_bot_arm_device', - 'iOS64 Debug': 'ios_gyp_debug_bot_arm64_device', + 'iOS64 Debug': 'ios_gyp_debug_static_bot_arm64_device', 'iOS64 Release': 'ios_gyp_release_bot_arm64_device', - 'iOS32 Debug Simulator': 'ios_gyp_debug_bot_x86', - 'iOS64 Debug Simulator': 'ios_gyp_debug_bot_x64', - 'iOS64 Debug (GN)': 'ios_gn_debug_bot_arm64_device', + 'iOS32 Debug Simulator': 'ios_gyp_debug_static_bot_x86', + 'iOS64 Debug Simulator': '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', # Mac @@ -89,13 +89,13 @@ }, 'tryserver.webrtc': { # iOS - 'ios_dbg': 'ios_gyp_debug_bot_arm_device', + 'ios_dbg': 'ios_gyp_debug_static_bot_arm_device', 'ios_rel': 'ios_gyp_release_bot_arm_device', - 'ios_arm64_dbg': 'ios_gyp_debug_bot_arm64_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_bot_x86', - 'ios64_sim_dbg': 'ios_gyp_debug_bot_x64', - 'ios64_gn_dbg': 'ios_gn_debug_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', # Mac @@ -173,29 +173,29 @@ # bots all using the 'gn_release_bot' config). 'configs': { # iOS - 'ios_gn_debug_bot_arm64_device': [ - 'ios', 'gn', 'ios_debug_bot', 'arm64', 'device' + 'ios_gn_debug_static_bot_arm64_device': [ + 'ios', 'gn', 'debug_static_bot', 'arm64', 'device' ], 'ios_gn_release_bot_arm64_device': [ - 'ios', 'gn', 'ios_release_bot', 'arm64', 'device' + 'ios', 'gn', 'release_bot', 'arm64', 'device' ], - 'ios_gyp_debug_bot_arm_device': [ - 'ios', 'gyp', 'ios_debug_bot', 'arm', 'device' + 'ios_gyp_debug_static_bot_arm_device': [ + 'ios', 'gyp', 'debug_static_bot', 'arm', 'device' ], 'ios_gyp_release_bot_arm_device': [ - 'ios', 'gyp', 'ios_release_bot', 'arm', 'device' + 'ios', 'gyp', 'release_bot', 'arm', 'device' ], - 'ios_gyp_debug_bot_arm64_device': [ - 'ios', 'gyp', 'ios_debug_bot', 'arm64', 'device' + 'ios_gyp_debug_static_bot_arm64_device': [ + 'ios', 'gyp', 'debug_static_bot', 'arm64', 'device' ], 'ios_gyp_release_bot_arm64_device': [ - 'ios', 'gyp', 'ios_release_bot', 'arm64', 'device' + 'ios', 'gyp', 'release_bot', 'arm64', 'device' ], - 'ios_gyp_debug_bot_x86': [ - 'ios', 'gyp', 'ios_debug_bot', 'x86' + 'ios_gyp_debug_static_bot_x86': [ + 'ios', 'gyp', 'debug_static_bot', 'x86' ], - 'ios_gyp_debug_bot_x64': [ - 'ios', 'gyp', 'ios_release_bot', 'x64' + 'ios_gyp_debug_static_bot_x64': [ + 'ios', 'gyp', 'release_bot', 'x64' ], # Linux, Mac and Windows @@ -399,14 +399,6 @@ 'gyp_defines': 'OS=ios', }, - 'ios_debug_bot': { - 'mixins': ['debug', 'shared'] - }, - - 'ios_release_bot': { - 'mixins': ['release', 'static'] - }, - 'lsan': { 'gn_args': 'is_lsan=true', 'gyp_defines': 'lsan=1',