From d3d8b6720a8d02282f3023c60f5e8bcfdad12555 Mon Sep 17 00:00:00 2001 From: kjellander Date: Thu, 11 Feb 2016 06:44:03 -0800 Subject: [PATCH] iOS: Remove MB and Goma for GYP builders. 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} --- webrtc/build/ios/client.webrtc.fyi/iOS32_Debug.json | 5 +---- webrtc/build/ios/client.webrtc.fyi/iOS32_Release.json | 5 +---- .../build/ios/client.webrtc.fyi/iOS32_Simulator_Debug.json | 5 +---- webrtc/build/ios/client.webrtc.fyi/iOS64_Debug.json | 5 +---- webrtc/build/ios/client.webrtc.fyi/iOS64_Debug_(GN).json | 6 ++---- webrtc/build/ios/client.webrtc.fyi/iOS64_Release.json | 5 +---- webrtc/build/ios/client.webrtc.fyi/iOS64_Release_(GN).json | 6 ++---- .../build/ios/client.webrtc.fyi/iOS64_Simulator_Debug.json | 5 +---- 8 files changed, 10 insertions(+), 32 deletions(-) diff --git a/webrtc/build/ios/client.webrtc.fyi/iOS32_Debug.json b/webrtc/build/ios/client.webrtc.fyi/iOS32_Debug.json index e74a3aecff..c6c068387d 100644 --- a/webrtc/build/ios/client.webrtc.fyi/iOS32_Debug.json +++ b/webrtc/build/ios/client.webrtc.fyi/iOS32_Debug.json @@ -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", diff --git a/webrtc/build/ios/client.webrtc.fyi/iOS32_Release.json b/webrtc/build/ios/client.webrtc.fyi/iOS32_Release.json index 063c65c0dd..cacc11fe79 100644 --- a/webrtc/build/ios/client.webrtc.fyi/iOS32_Release.json +++ b/webrtc/build/ios/client.webrtc.fyi/iOS32_Release.json @@ -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", diff --git a/webrtc/build/ios/client.webrtc.fyi/iOS32_Simulator_Debug.json b/webrtc/build/ios/client.webrtc.fyi/iOS32_Simulator_Debug.json index 3755348bc8..516eeafd41 100644 --- a/webrtc/build/ios/client.webrtc.fyi/iOS32_Simulator_Debug.json +++ b/webrtc/build/ios/client.webrtc.fyi/iOS32_Simulator_Debug.json @@ -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", diff --git a/webrtc/build/ios/client.webrtc.fyi/iOS64_Debug.json b/webrtc/build/ios/client.webrtc.fyi/iOS64_Debug.json index 2af231eeca..657ba91252 100644 --- a/webrtc/build/ios/client.webrtc.fyi/iOS64_Debug.json +++ b/webrtc/build/ios/client.webrtc.fyi/iOS64_Debug.json @@ -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", diff --git a/webrtc/build/ios/client.webrtc.fyi/iOS64_Debug_(GN).json b/webrtc/build/ios/client.webrtc.fyi/iOS64_Debug_(GN).json index f537def48f..eefcdd19f4 100644 --- a/webrtc/build/ios/client.webrtc.fyi/iOS64_Debug_(GN).json +++ b/webrtc/build/ios/client.webrtc.fyi/iOS64_Debug_(GN).json @@ -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", diff --git a/webrtc/build/ios/client.webrtc.fyi/iOS64_Release.json b/webrtc/build/ios/client.webrtc.fyi/iOS64_Release.json index 6b53990a7b..097a1b13de 100644 --- a/webrtc/build/ios/client.webrtc.fyi/iOS64_Release.json +++ b/webrtc/build/ios/client.webrtc.fyi/iOS64_Release.json @@ -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", diff --git a/webrtc/build/ios/client.webrtc.fyi/iOS64_Release_(GN).json b/webrtc/build/ios/client.webrtc.fyi/iOS64_Release_(GN).json index 02ee078ff1..bb324118a7 100644 --- a/webrtc/build/ios/client.webrtc.fyi/iOS64_Release_(GN).json +++ b/webrtc/build/ios/client.webrtc.fyi/iOS64_Release_(GN).json @@ -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", diff --git a/webrtc/build/ios/client.webrtc.fyi/iOS64_Simulator_Debug.json b/webrtc/build/ios/client.webrtc.fyi/iOS64_Simulator_Debug.json index 18e9a2037f..c997b5241e 100644 --- a/webrtc/build/ios/client.webrtc.fyi/iOS64_Simulator_Debug.json +++ b/webrtc/build/ios/client.webrtc.fyi/iOS64_Simulator_Debug.json @@ -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",