From 5f0c9f1ab4d561984050f471565129f60fe248a6 Mon Sep 17 00:00:00 2001 From: "kjellander@webrtc.org" Date: Tue, 3 Apr 2012 16:29:36 +0000 Subject: [PATCH] force_sync flag is no longer used. slave name updated to matching slave in slaves.cfg. BUG=None TEST=Tested running local master. Review URL: https://webrtc-codereview.appspot.com/476002 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1981 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../build_internal/masters/master.webrtc/master.cfg | 2 +- .../build_internal/scripts/webrtc_buildbot/utils.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/continuous_build/build_internal/masters/master.webrtc/master.cfg b/tools/continuous_build/build_internal/masters/master.webrtc/master.cfg index 5a52f18d5..093c4f6f6 100755 --- a/tools/continuous_build/build_internal/masters/master.webrtc/master.cfg +++ b/tools/continuous_build/build_internal/masters/master.webrtc/master.cfg @@ -297,7 +297,7 @@ android_builder_1 = { } android_builder_ndk = { 'name': 'AndroidNDK', - 'slavename': 'android-ndk', + 'slavename': 'webrtc-cb-linux-slave-10', 'builddir': 'android-ndk', 'factory': android_ndk_factory, } diff --git a/tools/continuous_build/build_internal/scripts/webrtc_buildbot/utils.py b/tools/continuous_build/build_internal/scripts/webrtc_buildbot/utils.py index 6bb423fa9..bad8d74d1 100755 --- a/tools/continuous_build/build_internal/scripts/webrtc_buildbot/utils.py +++ b/tools/continuous_build/build_internal/scripts/webrtc_buildbot/utils.py @@ -451,7 +451,7 @@ class WebRTCAndroidNDKFactory(WebRTCFactory): def EnableBuild(self): self.AddSmartCleanStep() self.AddGclientConfigStep() - self.AddGclientSyncStep(force_sync=True) + self.AddGclientSyncStep() cmd = 'source ./build/android/envsetup.sh && gclient runhooks' self.AddCommonStep(cmd, descriptor='gen_android_makefiles') cmd = 'source ./build/android/envsetup.sh && make -j8'