From f880285af2d787ceb7c4aadfde21e0c27b21adde Mon Sep 17 00:00:00 2001 From: kjellander Date: Mon, 21 Nov 2016 00:41:30 -0800 Subject: [PATCH] iOS: Cleanup buildbot JSON files + bump iOS version to 10.0 After https://chromium-review.googlesource.com/c/412190/ we can remove all the GYP variables. The GN args are also not used during runhooks (only GYP_DEFINES had any effect), so they're also removed to avoid confusion. Only use_goma=True was left since the ios recipe module uses it to decide if Goma shall be started on the bots. Delete unused GN/GYP-specific JSON files for bots that are now removed. Finally, bump iOS version 10.0 and change simulator phones to iPhone 6s to match what Chromium uses (may help solving bugs.webrtc.org/4752) BUG=webrtc:4752, webrtc:6323 NOTRY=True Review-Url: https://codereview.webrtc.org/2507063008 Cr-Commit-Position: refs/heads/master@{#15160} --- .../build/ios/client.webrtc/iOS32_Debug.json | 23 ++------ .../ios/client.webrtc/iOS32_Release.json | 23 ++------ .../client.webrtc/iOS32_Simulator_Debug.json | 29 +++------- .../build/ios/client.webrtc/iOS64_Debug.json | 23 ++------ .../ios/client.webrtc/iOS64_Debug_(GN).json | 34 ----------- .../ios/client.webrtc/iOS64_Debug_(GYP).json | 55 ------------------ .../ios/client.webrtc/iOS64_Release.json | 23 ++------ .../ios/client.webrtc/iOS64_Release_(GN).json | 34 ----------- .../client.webrtc/iOS64_Release_(GYP).json | 55 ------------------ .../client.webrtc/iOS64_Simulator_Debug.json | 29 +++------- .../ios/tryserver.webrtc/ios32_sim_dbg.json | 29 +++------- .../ios/tryserver.webrtc/ios64_gn_dbg.json | 35 ------------ .../ios/tryserver.webrtc/ios64_gn_rel.json | 35 ------------ .../ios/tryserver.webrtc/ios64_gyp_dbg.json | 56 ------------------- .../ios/tryserver.webrtc/ios64_gyp_rel.json | 56 ------------------- .../ios/tryserver.webrtc/ios64_sim_dbg.json | 29 +++------- .../ios/tryserver.webrtc/ios_arm64_dbg.json | 23 ++------ .../ios/tryserver.webrtc/ios_arm64_rel.json | 23 ++------ .../build/ios/tryserver.webrtc/ios_dbg.json | 23 ++------ .../build/ios/tryserver.webrtc/ios_rel.json | 23 ++------ 20 files changed, 72 insertions(+), 588 deletions(-) delete mode 100644 webrtc/build/ios/client.webrtc/iOS64_Debug_(GN).json delete mode 100644 webrtc/build/ios/client.webrtc/iOS64_Debug_(GYP).json delete mode 100644 webrtc/build/ios/client.webrtc/iOS64_Release_(GN).json delete mode 100644 webrtc/build/ios/client.webrtc/iOS64_Release_(GYP).json delete mode 100644 webrtc/build/ios/tryserver.webrtc/ios64_gn_dbg.json delete mode 100644 webrtc/build/ios/tryserver.webrtc/ios64_gn_rel.json delete mode 100644 webrtc/build/ios/tryserver.webrtc/ios64_gyp_dbg.json delete mode 100644 webrtc/build/ios/tryserver.webrtc/ios64_gyp_rel.json diff --git a/webrtc/build/ios/client.webrtc/iOS32_Debug.json b/webrtc/build/ios/client.webrtc/iOS32_Debug.json index 24d8e97fe5..44de732ee9 100644 --- a/webrtc/build/ios/client.webrtc/iOS32_Debug.json +++ b/webrtc/build/ios/client.webrtc/iOS32_Debug.json @@ -4,31 +4,18 @@ ], "comments": [ "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." + "gn_args in this file is only read by the buildbot recipe; ", + "webrtc/build/mb_config.pyl contains the actual build configuration.", + "TODO(kjellander): remove gn_args when the recipe is updated." ], "xcode version": "8.0", - "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_goma=true" ], - "mb_type": "gn", "compiler": "ninja", "additional_compile_targets": [ "all" ], "configuration": "Debug", - "sdk": "iphoneos9.0", + "sdk": "iphoneos10.0", "tests": [ ] } diff --git a/webrtc/build/ios/client.webrtc/iOS32_Release.json b/webrtc/build/ios/client.webrtc/iOS32_Release.json index 411b2c381c..3b8310fa58 100644 --- a/webrtc/build/ios/client.webrtc/iOS32_Release.json +++ b/webrtc/build/ios/client.webrtc/iOS32_Release.json @@ -4,31 +4,18 @@ ], "comments": [ "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." + "gn_args in this file is only read by the buildbot recipe; ", + "webrtc/build/mb_config.pyl contains the actual build configuration.", + "TODO(kjellander): remove gn_args when the recipe is updated." ], "xcode version": "8.0", - "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_goma=true" ], - "mb_type": "gn", "compiler": "ninja", "additional_compile_targets": [ "all" ], "configuration": "Release", - "sdk": "iphoneos9.0", + "sdk": "iphoneos10.0", "tests": [ ] } diff --git a/webrtc/build/ios/client.webrtc/iOS32_Simulator_Debug.json b/webrtc/build/ios/client.webrtc/iOS32_Simulator_Debug.json index 86aad3e3fb..959a9b4e2e 100644 --- a/webrtc/build/ios/client.webrtc/iOS32_Simulator_Debug.json +++ b/webrtc/build/ios/client.webrtc/iOS32_Simulator_Debug.json @@ -3,37 +3,24 @@ "kjellander" ], "comments": [ - "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." + "Tests for 32-bit iOS simulators.", + "gn_args in this file is only read by the buildbot recipe; ", + "webrtc/build/mb_config.pyl contains the actual build configuration.", + "TODO(kjellander): remove gn_args when the recipe is updated." ], "xcode version": "8.0", - "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\"" + "use_goma=true" ], - "mb_type": "gn", "compiler": "ninja", "additional_compile_targets": [ "all" ], "configuration": "Debug", - "sdk": "iphonesimulator9.0", + "sdk": "iphonesimulator10.0", "tests": [ { "include": "common_tests.json", - "device type": "iPhone 5s", - "os": "9.0" + "device type": "iPhone 6s", + "os": "10.0" } ] } diff --git a/webrtc/build/ios/client.webrtc/iOS64_Debug.json b/webrtc/build/ios/client.webrtc/iOS64_Debug.json index 441fcaf04b..9060d43c7a 100644 --- a/webrtc/build/ios/client.webrtc/iOS64_Debug.json +++ b/webrtc/build/ios/client.webrtc/iOS64_Debug.json @@ -4,31 +4,18 @@ ], "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." + "gn_args in this file is only read by the buildbot recipe; ", + "webrtc/build/mb_config.pyl contains the actual build configuration.", + "TODO(kjellander): remove gn_args when the recipe is updated." ], "xcode version": "8.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\"" + "use_goma=true" ], - "mb_type": "gn", "compiler": "ninja", "additional_compile_targets": [ "all" ], "configuration": "Debug", - "sdk": "iphoneos9.0", + "sdk": "iphoneos10.0", "tests": [ ] } diff --git a/webrtc/build/ios/client.webrtc/iOS64_Debug_(GN).json b/webrtc/build/ios/client.webrtc/iOS64_Debug_(GN).json deleted file mode 100644 index cf070cc05d..0000000000 --- a/webrtc/build/ios/client.webrtc/iOS64_Debug_(GN).json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "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": "8.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": [ - ] -} diff --git a/webrtc/build/ios/client.webrtc/iOS64_Debug_(GYP).json b/webrtc/build/ios/client.webrtc/iOS64_Debug_(GYP).json deleted file mode 100644 index 9ad4a55c3b..0000000000 --- a/webrtc/build/ios/client.webrtc/iOS64_Debug_(GYP).json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "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": "8.0", - "GYP_DEFINES": [ - "use_goma=1", - "gomadir=$(goma_dir)", - "chromium_ios_signing=0", - "component=static_library", - "target_arch=arm64", - "include_examples=0", - "include_tests=0", - "include_ilbc=0", - "build_expat=0", - "build_json=0", - "build_libevent=0", - "build_libjpeg=0", - "build_libsrtp=0", - "build_libvpx=0", - "build_libyuv=0", - "build_openmax_dl=0", - "build_opus=0", - "build_protobuf=0", - "build_ssl=0", - "build_usrsctp=0", - "enable_video=0", - "linux_use_bundled_binutils=0", - "rtc_use_openmax_dl=1", - "use_openssl=1", - "use_x11=0", - "use_gtk=0" - ], - "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": [ - ] -} diff --git a/webrtc/build/ios/client.webrtc/iOS64_Release.json b/webrtc/build/ios/client.webrtc/iOS64_Release.json index c43d76296e..fe5b894214 100644 --- a/webrtc/build/ios/client.webrtc/iOS64_Release.json +++ b/webrtc/build/ios/client.webrtc/iOS64_Release.json @@ -4,31 +4,18 @@ ], "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." + "gn_args in this file is only read by the buildbot recipe; ", + "webrtc/build/mb_config.pyl contains the actual build configuration.", + "TODO(kjellander): remove gn_args when the recipe is updated." ], "xcode version": "8.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\"" + "use_goma=true" ], - "mb_type": "gn", "compiler": "ninja", "additional_compile_targets": [ "all" ], "configuration": "Release", - "sdk": "iphoneos9.0", + "sdk": "iphoneos10.0", "tests": [ ] } diff --git a/webrtc/build/ios/client.webrtc/iOS64_Release_(GN).json b/webrtc/build/ios/client.webrtc/iOS64_Release_(GN).json deleted file mode 100644 index 1f5b4a6bd7..0000000000 --- a/webrtc/build/ios/client.webrtc/iOS64_Release_(GN).json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "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": "8.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": [ - ] -} diff --git a/webrtc/build/ios/client.webrtc/iOS64_Release_(GYP).json b/webrtc/build/ios/client.webrtc/iOS64_Release_(GYP).json deleted file mode 100644 index 0d17ba7990..0000000000 --- a/webrtc/build/ios/client.webrtc/iOS64_Release_(GYP).json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "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": "8.0", - "GYP_DEFINES": [ - "use_goma=1", - "gomadir=$(goma_dir)", - "chromium_ios_signing=0", - "component=static_library", - "target_arch=arm64", - "include_examples=0", - "include_tests=0", - "include_ilbc=0", - "build_expat=0", - "build_json=0", - "build_libevent=0", - "build_libjpeg=0", - "build_libsrtp=0", - "build_libvpx=0", - "build_libyuv=0", - "build_openmax_dl=0", - "build_opus=0", - "build_protobuf=0", - "build_ssl=0", - "build_usrsctp=0", - "enable_video=0", - "linux_use_bundled_binutils=0", - "rtc_use_openmax_dl=1", - "use_openssl=1", - "use_x11=0", - "use_gtk=0" - ], - "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": [ - ] -} diff --git a/webrtc/build/ios/client.webrtc/iOS64_Simulator_Debug.json b/webrtc/build/ios/client.webrtc/iOS64_Simulator_Debug.json index 32c36a285a..959a9b4e2e 100644 --- a/webrtc/build/ios/client.webrtc/iOS64_Simulator_Debug.json +++ b/webrtc/build/ios/client.webrtc/iOS64_Simulator_Debug.json @@ -3,37 +3,24 @@ "kjellander" ], "comments": [ - "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." + "Tests for 32-bit iOS simulators.", + "gn_args in this file is only read by the buildbot recipe; ", + "webrtc/build/mb_config.pyl contains the actual build configuration.", + "TODO(kjellander): remove gn_args when the recipe is updated." ], "xcode version": "8.0", - "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\"" + "use_goma=true" ], - "mb_type": "gn", "compiler": "ninja", "additional_compile_targets": [ "all" ], "configuration": "Debug", - "sdk": "iphonesimulator9.0", + "sdk": "iphonesimulator10.0", "tests": [ { "include": "common_tests.json", - "device type": "iPhone 5s", - "os": "9.0" + "device type": "iPhone 6s", + "os": "10.0" } ] } diff --git a/webrtc/build/ios/tryserver.webrtc/ios32_sim_dbg.json b/webrtc/build/ios/tryserver.webrtc/ios32_sim_dbg.json index 6b4aacb569..782f1613a8 100644 --- a/webrtc/build/ios/tryserver.webrtc/ios32_sim_dbg.json +++ b/webrtc/build/ios/tryserver.webrtc/ios32_sim_dbg.json @@ -3,38 +3,25 @@ "kjellander" ], "comments": [ - "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." + "Tests for 32-bit iOS simulators.", + "gn_args in this file is only read by the buildbot recipe; ", + "webrtc/build/mb_config.pyl contains the actual build configuration.", + "TODO(kjellander): remove gn_args when the recipe is updated." ], "xcode version": "8.0", - "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\"" + "use_goma=true" ], - "mb_type": "gn", "use_analyze": false, "compiler": "ninja", "additional_compile_targets": [ "all" ], "configuration": "Debug", - "sdk": "iphonesimulator9.0", + "sdk": "iphonesimulator10.0", "tests": [ { "include": "common_tests.json", - "device type": "iPhone 5s", - "os": "9.0" + "device type": "iPhone 6s", + "os": "10.0" } ] } diff --git a/webrtc/build/ios/tryserver.webrtc/ios64_gn_dbg.json b/webrtc/build/ios/tryserver.webrtc/ios64_gn_dbg.json deleted file mode 100644 index af16ffa489..0000000000 --- a/webrtc/build/ios/tryserver.webrtc/ios64_gn_dbg.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "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": "8.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": [ - ] -} diff --git a/webrtc/build/ios/tryserver.webrtc/ios64_gn_rel.json b/webrtc/build/ios/tryserver.webrtc/ios64_gn_rel.json deleted file mode 100644 index 3c79060e2e..0000000000 --- a/webrtc/build/ios/tryserver.webrtc/ios64_gn_rel.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "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": "8.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": [ - ] -} diff --git a/webrtc/build/ios/tryserver.webrtc/ios64_gyp_dbg.json b/webrtc/build/ios/tryserver.webrtc/ios64_gyp_dbg.json deleted file mode 100644 index 90770b4399..0000000000 --- a/webrtc/build/ios/tryserver.webrtc/ios64_gyp_dbg.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "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": "8.0", - "GYP_DEFINES": [ - "use_goma=1", - "gomadir=$(goma_dir)", - "chromium_ios_signing=0", - "component=static_library", - "target_arch=arm64", - "include_examples=0", - "include_tests=0", - "include_ilbc=0", - "build_expat=0", - "build_json=0", - "build_libevent=0", - "build_libjpeg=0", - "build_libsrtp=0", - "build_libvpx=0", - "build_libyuv=0", - "build_openmax_dl=0", - "build_opus=0", - "build_protobuf=0", - "build_ssl=0", - "build_usrsctp=0", - "enable_video=0", - "linux_use_bundled_binutils=0", - "rtc_use_openmax_dl=1", - "use_openssl=1", - "use_x11=0", - "use_gtk=0" - ], - "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": [ - ] -} diff --git a/webrtc/build/ios/tryserver.webrtc/ios64_gyp_rel.json b/webrtc/build/ios/tryserver.webrtc/ios64_gyp_rel.json deleted file mode 100644 index 7b27b61351..0000000000 --- a/webrtc/build/ios/tryserver.webrtc/ios64_gyp_rel.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "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": "8.0", - "GYP_DEFINES": [ - "use_goma=1", - "gomadir=$(goma_dir)", - "chromium_ios_signing=0", - "component=static_library", - "target_arch=arm64", - "include_examples=0", - "include_tests=0", - "include_ilbc=0", - "build_expat=0", - "build_json=0", - "build_libevent=0", - "build_libjpeg=0", - "build_libsrtp=0", - "build_libvpx=0", - "build_libyuv=0", - "build_openmax_dl=0", - "build_opus=0", - "build_protobuf=0", - "build_ssl=0", - "build_usrsctp=0", - "enable_video=0", - "linux_use_bundled_binutils=0", - "rtc_use_openmax_dl=1", - "use_openssl=1", - "use_x11=0", - "use_gtk=0" - ], - "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": [ - ] -} diff --git a/webrtc/build/ios/tryserver.webrtc/ios64_sim_dbg.json b/webrtc/build/ios/tryserver.webrtc/ios64_sim_dbg.json index 689c4d3433..4952f0a57a 100644 --- a/webrtc/build/ios/tryserver.webrtc/ios64_sim_dbg.json +++ b/webrtc/build/ios/tryserver.webrtc/ios64_sim_dbg.json @@ -3,38 +3,25 @@ "kjellander" ], "comments": [ - "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." + "Tests for 64-bit iOS simulators.", + "gn_args in this file is only read by the buildbot recipe; ", + "webrtc/build/mb_config.pyl contains the actual build configuration.", + "TODO(kjellander): remove gn_args when the recipe is updated." ], "xcode version": "8.0", - "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\"" + "use_goma=true" ], - "mb_type": "gn", "use_analyze": false, "compiler": "ninja", "additional_compile_targets": [ "all" ], "configuration": "Debug", - "sdk": "iphonesimulator9.0", + "sdk": "iphonesimulator10.0", "tests": [ { "include": "common_tests.json", - "device type": "iPhone 5s", - "os": "9.0" + "device type": "iPhone 6s", + "os": "10.0" } ] } diff --git a/webrtc/build/ios/tryserver.webrtc/ios_arm64_dbg.json b/webrtc/build/ios/tryserver.webrtc/ios_arm64_dbg.json index e23da1fdc2..f4c605cb7c 100644 --- a/webrtc/build/ios/tryserver.webrtc/ios_arm64_dbg.json +++ b/webrtc/build/ios/tryserver.webrtc/ios_arm64_dbg.json @@ -4,32 +4,19 @@ ], "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." + "gn_args in this file is only read by the buildbot recipe; ", + "webrtc/build/mb_config.pyl contains the actual build configuration.", + "TODO(kjellander): remove gn_args when the recipe is updated." ], "xcode version": "8.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\"" + "use_goma=true" ], "use_analyze": false, - "mb_type": "gn", "compiler": "ninja", "additional_compile_targets": [ "all" ], "configuration": "Debug", - "sdk": "iphoneos9.0", + "sdk": "iphoneos10.0", "tests": [ ] } diff --git a/webrtc/build/ios/tryserver.webrtc/ios_arm64_rel.json b/webrtc/build/ios/tryserver.webrtc/ios_arm64_rel.json index dc4d20cd0c..719c8074d0 100644 --- a/webrtc/build/ios/tryserver.webrtc/ios_arm64_rel.json +++ b/webrtc/build/ios/tryserver.webrtc/ios_arm64_rel.json @@ -4,32 +4,19 @@ ], "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." + "gn_args in this file is only read by the buildbot recipe; ", + "webrtc/build/mb_config.pyl contains the actual build configuration.", + "TODO(kjellander): remove gn_args when the recipe is updated." ], "xcode version": "8.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\"" + "use_goma=true" ], "use_analyze": false, - "mb_type": "gn", "compiler": "ninja", "additional_compile_targets": [ "all" ], "configuration": "Release", - "sdk": "iphoneos9.0", + "sdk": "iphoneos10.0", "tests": [ ] } diff --git a/webrtc/build/ios/tryserver.webrtc/ios_dbg.json b/webrtc/build/ios/tryserver.webrtc/ios_dbg.json index 06ece2fae1..f78ef81b15 100644 --- a/webrtc/build/ios/tryserver.webrtc/ios_dbg.json +++ b/webrtc/build/ios/tryserver.webrtc/ios_dbg.json @@ -4,32 +4,19 @@ ], "comments": [ "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." + "gn_args in this file is only read by the buildbot recipe; ", + "webrtc/build/mb_config.pyl contains the actual build configuration.", + "TODO(kjellander): remove gn_args when the recipe is updated." ], "xcode version": "8.0", - "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_goma=true" ], "use_analyze": false, - "mb_type": "gn", "compiler": "ninja", "additional_compile_targets": [ "all" ], "configuration": "Debug", - "sdk": "iphoneos9.0", + "sdk": "iphoneos10.0", "tests": [ ] } diff --git a/webrtc/build/ios/tryserver.webrtc/ios_rel.json b/webrtc/build/ios/tryserver.webrtc/ios_rel.json index b4766c8aa4..29eda352d7 100644 --- a/webrtc/build/ios/tryserver.webrtc/ios_rel.json +++ b/webrtc/build/ios/tryserver.webrtc/ios_rel.json @@ -4,32 +4,19 @@ ], "comments": [ "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." + "gn_args in this file is only read by the buildbot recipe; ", + "webrtc/build/mb_config.pyl contains the actual build configuration.", + "TODO(kjellander): remove gn_args when the recipe is updated." ], "xcode version": "8.0", - "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_goma=true" ], "use_analyze": false, - "mb_type": "gn", "compiler": "ninja", "additional_compile_targets": [ "all" ], "configuration": "Release", - "sdk": "iphoneos9.0", + "sdk": "iphoneos10.0", "tests": [ ] }