Chromium Code Reviews Chromium Code Reviews
Issue 2422653003:
Modify 'build_dir' for run_mb() to avoid double 'Debug' (Closed)
| OLD | NEW |
|---|---|
| 1 # Copyright 2016 The Chromium Authors. All rights reserved. | 1 # Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 from recipe_engine import recipe_api | 5 from recipe_engine import recipe_api |
| 6 from recipe_engine.recipe_api import Property | 6 from recipe_engine.recipe_api import Property |
| 7 from recipe_engine.types import freeze | 7 from recipe_engine.types import freeze |
| 8 | 8 |
| 9 DEPS = [ | 9 DEPS = [ |
| 10 'chromium', | 10 'chromium', |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 50 INTERNAL=False, | 50 INTERNAL=False, |
| 51 BUILD_CONFIG=builder['target']) | 51 BUILD_CONFIG=builder['target']) |
| 52 | 52 |
| 53 api.gclient.set_config(builder['gclient_config']) | 53 api.gclient.set_config(builder['gclient_config']) |
| 54 api.gclient.apply_config(builder['gclient_apply_config']) | 54 api.gclient.apply_config(builder['gclient_apply_config']) |
| 55 api.bot_update.ensure_checkout() | 55 api.bot_update.ensure_checkout() |
| 56 api.chromium.ensure_goma() | 56 api.chromium.ensure_goma() |
| 57 api.chromium_android.clean_local_files() | 57 api.chromium_android.clean_local_files() |
| 58 api.chromium.runhooks() | 58 api.chromium.runhooks() |
| 59 | 59 |
| 60 android_build = api.path['checkout'].join( | 60 android_build = api.path['checkout'].join('out-android') |
|
shenghuazhang
2016/10/14 21:41:23
Remove 'Debug' here to avoid double 'Debug' when e
mikecase (-- gone --)
2016/10/14 21:44:47
yup, seems like you need to do this.
| |
| 61 'out-android', api.chromium.c.build_config_fs) | 61 linux_build = api.path['checkout'].join('out-linux') |
| 62 linux_build = api.path['checkout'].join( | |
| 63 'out-linux', api.chromium.c.build_config_fs) | |
| 64 | 62 |
| 65 api.chromium.run_mb(mastername=mastername, | 63 api.chromium.run_mb(mastername=mastername, |
| 66 buildername=buildername, | 64 buildername=buildername, |
| 67 build_dir=linux_build, | 65 build_dir=linux_build.join( |
| 66 api.chromium.c.build_config_fs), | |
| 68 phase='engine') | 67 phase='engine') |
| 69 api.chromium.compile(targets=['blimp'], | 68 api.chromium.compile(targets=['blimp'], |
|
shenghuazhang
2016/10/14 21:41:23
api.chromium.compile would add '--target' anyway:
| |
| 70 out_dir=linux_build) | 69 out_dir=linux_build) |
| 71 api.chromium.run_mb(mastername=mastername, | 70 api.chromium.run_mb(mastername=mastername, |
| 72 buildername=buildername, | 71 buildername=buildername, |
| 73 build_dir=android_build, | 72 build_dir=android_build.join( |
| 73 api.chromium.c.build_config_fs), | |
| 74 phase='client') | 74 phase='client') |
| 75 api.chromium.compile(targets=['blimp', 'chrome_public_apk'], | 75 api.chromium.compile(targets=['blimp', 'chrome_public_apk'], |
| 76 out_dir=android_build) | 76 out_dir=android_build) |
| 77 | 77 |
| 78 | 78 |
| 79 def GenTests(api): | 79 def GenTests(api): |
| 80 sanitize = lambda s: ''.join(c if c.isalnum() else '_' for c in s) | 80 sanitize = lambda s: ''.join(c if c.isalnum() else '_' for c in s) |
| 81 | 81 |
| 82 yield ( | 82 yield ( |
| 83 api.test('%s_test_pass' % sanitize('Blimp Client Engine Integration')) + | 83 api.test('%s_test_pass' % sanitize('Blimp Client Engine Integration')) + |
| 84 api.properties.generic( | 84 api.properties.generic( |
| 85 buildername='Blimp Client Engine Integration', | 85 buildername='Blimp Client Engine Integration', |
| 86 mastername='chromium.fyi') | 86 mastername='chromium.fyi') |
| 87 ) | 87 ) |
| OLD | NEW |
