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

Unified Diff: testing/scripts/webview_licenses.py

Issue 935333002: Update from https://crrev.com/316786 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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 | « testing/scripts/host_info.py ('k') | testing/test_env.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: testing/scripts/webview_licenses.py
diff --git a/testing/scripts/checklicenses.py b/testing/scripts/webview_licenses.py
similarity index 67%
copy from testing/scripts/checklicenses.py
copy to testing/scripts/webview_licenses.py
index 43342d0254660446a56231ce55513c2e38b5ae8e..255c62e993111f82f0d47d2445ed89312ea28c16 100755
--- a/testing/scripts/checklicenses.py
+++ b/testing/scripts/webview_licenses.py
@@ -14,21 +14,18 @@ import common
def main_run(args):
with common.temporary_file() as tempfile_path:
rc = common.run_command([
- os.path.join(common.SRC_DIR, 'tools', 'checklicenses',
- 'checklicenses.py'),
+ os.path.join(common.SRC_DIR, 'android_webview', 'tools',
+ 'webview_licenses.py'),
+ 'scan',
'--json', tempfile_path
])
with open(tempfile_path) as f:
- checklicenses_results = json.load(f)
-
- result_set = set()
- for result in checklicenses_results:
- result_set.add((result['filename'], result['license']))
+ results = json.load(f)
json.dump({
'valid': True,
- 'failures': ['%s: %s' % (r[0], r[1]) for r in result_set],
+ 'failures': results,
}, args.output)
return rc
« no previous file with comments | « testing/scripts/host_info.py ('k') | testing/test_env.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698