Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(346)

Unified Diff: scripts/slave/recipe_modules/chromium_android/api.py

Issue 303513002: Initial work towards public Android recipes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | scripts/slave/recipes/chromium.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipe_modules/chromium_android/api.py
diff --git a/scripts/slave/recipe_modules/chromium_android/api.py b/scripts/slave/recipe_modules/chromium_android/api.py
index dcf89977874236f5f52bc26bfef97fd2a1336d89..ce77154740b975de7e6034fdcb8aa076ac092135 100644
--- a/scripts/slave/recipe_modules/chromium_android/api.py
+++ b/scripts/slave/recipe_modules/chromium_android/api.py
@@ -204,13 +204,17 @@ class AndroidApi(recipe_api.RecipeApi):
return self.m.chromium.compile(**kwargs)
def findbugs(self):
luqui 2014/05/27 18:39:35 This is going to conflict with this change once I
Paweł Hajdan Jr. 2014/05/28 12:53:21 Done.
- assert self.c.INTERNAL, 'findbugs is only available on internal builds'
- cmd = [
- self.m.path['checkout'].join('build', 'android', 'findbugs_diff.py'),
- '-b', self.internal_dir.join('bin', 'findbugs_filter'),
- '-o', 'com.google.android.apps.chrome.-,org.chromium.-',
- ]
- yield self.m.step('findbugs internal', cmd, env=self.get_env())
+ cmd = [self.m.path['checkout'].join('build', 'android', 'findbugs_diff.py')]
+ if self.m.chromium.c.BUILD_CONFIG == 'Release':
+ cmd.append('--release-build')
+ if self.c.INTERNAL:
+ cmd.extend([
+ '-b', self.internal_dir.join('bin', 'findbugs_filter'),
+ '-o', 'com.google.android.apps.chrome.-,org.chromium.-',
+ ])
+ yield self.m.step('findbugs internal', cmd, env=self.get_env())
+ else:
+ yield self.m.step('findbugs', cmd, env=self.get_env())
# If findbugs fails, there could be stale class files. Delete them, and
# next run maybe we'll do better.
@@ -220,6 +224,13 @@ class AndroidApi(recipe_api.RecipeApi):
self.m.path['checkout'].join('out'),
always_run=True)
+ if not self.c.INTERNAL:
+ cmd = [self.m.path['checkout'].join('tools', 'android', 'findbugs_plugin',
+ 'test', 'run_findbugs_plugin_tests.py')]
+ if self.m.chromium.c.BUILD_CONFIG == 'Release':
+ cmd.append('--release-build')
+ yield self.m.step('findbugs_tests', cmd, env=self.get_env())
+
def checkdeps(self):
assert self.c.INTERNAL, 'checkdeps is only available on internal builds'
yield self.m.step(
@@ -228,6 +239,14 @@ class AndroidApi(recipe_api.RecipeApi):
'--root=%s' % self.internal_dir],
env=self.get_env())
+ def checklicenses(self):
+ yield self.m.step(
+ 'check_licenses',
+ [self.m.path['checkout'].join('android_webview', 'tools',
+ 'webview_licenses.py'),
+ 'scan'],
+ env=self.get_env())
+
def lint(self):
assert self.c.INTERNAL, 'lint is only available on internal builds'
yield self.m.step(
@@ -347,7 +366,7 @@ class AndroidApi(recipe_api.RecipeApi):
self.m.chromium.c.build_dir.join('logcat')],
env=self.get_env(), can_fail_build=False)
- def device_status_check(self, restart_usb=False):
+ def device_status_check(self, restart_usb=False, **kwargs):
args = []
if restart_usb:
args = ['--restart-usb']
@@ -355,15 +374,17 @@ class AndroidApi(recipe_api.RecipeApi):
'device_status_check',
[self.m.path['checkout'].join('build', 'android', 'buildbot',
'bb_device_status_check.py')] + args,
- env=self.get_env())
+ env=self.get_env(),
+ **kwargs)
- def provision_devices(self):
+ def provision_devices(self, **kwargs):
yield self.m.python(
'provision_devices',
self.m.path['checkout'].join(
'build', 'android', 'provision_devices.py'),
args=['-t', self.m.chromium.c.BUILD_CONFIG],
- can_fail_build=False)
+ can_fail_build=False,
+ **kwargs)
def detect_and_setup_devices(self):
yield self.device_status_check()
« no previous file with comments | « no previous file | scripts/slave/recipes/chromium.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698