zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iOS: Remove MB and Goma for GYP builders.

Browse Source 
This reverts "iOS: Add mb_type config for GYP builders."
and also removes Goma from these builders, as it will not work for WebRTC
since MB's GYP mode is hardcoded to use gyp_chromium.
MB should be working for GN since it's a stand-alone tool.

Goma doesn't work since $(goma_dir) in the JSON throws an error during
compile. So let's turn off Goma for these bots for now.

BUG=chromium:498746
NOTRY=True
TBR=smut@google.com

Review URL: https://codereview.webrtc.org/1685683007

Cr-Commit-Position: refs/heads/master@{#11578}
This commit is contained in:
kjellander
2016-02-11 06:44:03 -08:00
committed by Commit bot
parent 67ca0e1650
commit d3d8b6720a
8 changed files with 10 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
webrtc/build/ios/client.webrtc.fyi/iOS32_Debug.json
View File

@ -8,11 +8,8 @@
"xcode version": "7.0",
"GYP_DEFINES": {
"chromium_ios_signing": "0",
"target_arch": "arm",
"use_goma": "1",
"gomadir": "$(goma_dir)"
"target_arch": "arm"
},
"mb_type": "gyp",
"compiler": "ninja",
"configuration": "Debug",
"sdk": "iphoneos9.0",

5
webrtc/build/ios/client.webrtc.fyi/iOS32_Release.json
View File

@ -8,11 +8,8 @@
"xcode version": "7.0",
"GYP_DEFINES": {
"chromium_ios_signing": "0",
"target_arch": "arm",
"use_goma": "1",
"gomadir": "$(goma_dir)"
"target_arch": "arm"
},
"mb_type": "gyp",
"compiler": "ninja",
"configuration": "Release",
"sdk": "iphoneos9.0",

5
webrtc/build/ios/client.webrtc.fyi/iOS32_Simulator_Debug.json
View File

@ -8,11 +8,8 @@
"xcode version": "7.0",
"GYP_DEFINES": {
"chromium_ios_signing": "0",
"target_arch": "ia32",
"use_goma": "1",
"gomadir": "$(goma_dir)"
"target_arch": "ia32"
},
"mb_type": "gyp",
"compiler": "ninja",
"configuration": "Debug",
"sdk": "iphonesimulator9.0",

5
webrtc/build/ios/client.webrtc.fyi/iOS64_Debug.json
View File

@ -8,11 +8,8 @@
"xcode version": "7.0",
"GYP_DEFINES": {
"chromium_ios_signing": "0",
"target_arch": "arm64",
"use_goma": "1",
"gomadir": "$(goma_dir)"
"target_arch": "arm64"
},
"mb_type": "gyp",
"compiler": "ninja",
"configuration": "Debug",
"sdk": "iphoneos9.0",

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

@ -1,6 +1,6 @@
{
"owners": [
"kjellander",
"kjellander"
],
"comments": [
"GN + Ninja builder."
@ -13,9 +13,7 @@
"gn_args": [
"ios_enable_code_signing=false",
"target_cpu=\"arm\"",
"target_os=\"ios\"",
"use_goma=true",
"goma_dir=$(goma_dir)"
"target_os=\"ios\""
],
"mb_type": "gn",
"compiler": "ninja",

5
webrtc/build/ios/client.webrtc.fyi/iOS64_Release.json
View File

@ -8,11 +8,8 @@
"xcode version": "7.0",
"GYP_DEFINES": {
"chromium_ios_signing": "0",
"target_arch": "arm64",
"use_goma": "1",
"gomadir": "$(goma_dir)"
"target_arch": "arm64"
},
"mb_type": "gyp",
"compiler": "ninja",
"configuration": "Release",
"sdk": "iphoneos9.0",

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

@ -1,6 +1,6 @@
{
"owners": [
"kjellander",
"kjellander"
],
"comments": [
"GN + Ninja builder."
@ -13,9 +13,7 @@
"gn_args": [
"ios_enable_code_signing=false",
"target_cpu=\"arm\"",
"target_os=\"ios\"",
"use_goma=true",
"goma_dir=$(goma_dir)"
"target_os=\"ios\""
],
"mb_type": "gn",
"compiler": "ninja",

5
webrtc/build/ios/client.webrtc.fyi/iOS64_Simulator_Debug.json
View File

@ -8,11 +8,8 @@
"xcode version": "7.0",
"GYP_DEFINES": {
"chromium_ios_signing": "0",
"target_arch": "x64",
"use_goma": "1",
"gomadir": "$(goma_dir)"
"target_arch": "x64"
},
"mb_type": "gyp",
"compiler": "ninja",
"configuration": "Debug",
"sdk": "iphonesimulator9.0",