diff options
| -rw-r--r-- | PRESUBMIT.py | 13 | ||||
| -rw-r--r-- | build/all_android.gyp | 4 |
2 files changed, 17 insertions, 0 deletions
diff --git a/PRESUBMIT.py b/PRESUBMIT.py index aa79141..fd1df32 100644 --- a/PRESUBMIT.py +++ b/PRESUBMIT.py @@ -342,4 +342,17 @@ def GetPreferredTrySlaves(project, change): aura_re = '_aura[^/]*[.][^/]*' if any(re.search(aura_re, f.LocalPath()) for f in change.AffectedFiles()): preferred.append('linux_chromeos') + # For bringup (staging of upstream work) we must be careful to not + # overload Android infrastructure. Keeping Android try decisions in a + # single location (instead of adding conditionals in base/, net/, ...) + # will help us avoid doing so. For example, we are starting off with + # 2 trybots (compared against ~45 for Mac and Linux). + # If any file matches something compiled on the main waterfall + # android builder, use the android try server. + android_re_list = ('^base/', '^ipc/', '^net/', '^sql/', '^jingle/', + '^build/common.gypi$') + for f in change.AffectedFiles(): + if any(re.search(r, f.LocalPath()) for r in android_re_list): + preferred.append('android') + break return preferred diff --git a/build/all_android.gyp b/build/all_android.gyp index ae2370c..f1b0f90 100644 --- a/build/all_android.gyp +++ b/build/all_android.gyp @@ -21,6 +21,10 @@ # until the full set supported. If adding a new test here, # please also add it to build/android/run_tests.py, else the # test is not run. + # + # WARNING: + # Do not add targets here without communicating the implications + # on tryserver triggers and load. Discuss with jrg please. 'target_name': 'android_builder_tests', 'type': 'none', 'dependencies': [ |