Skip to content

Commit

Permalink
[about:credits] Make webview use chrome license file
Browse files Browse the repository at this point in the history
This CL also deletes webview_licenses.py and related files.

Bug: 734846
Change-Id: Ib1dcdbd10c8c97993811e0c977bfaa68d0562315
Reviewed-on: https://chromium-review.googlesource.com/569075
Reviewed-by: Richard Coles <torne@chromium.org>
Reviewed-by: Paweł Hajdan Jr. <phajdan.jr@chromium.org>
Reviewed-by: Misha Efimov <mef@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Commit-Queue: Yipeng Wang <yipengw@chromium.org>
Cr-Commit-Position: refs/heads/master@{#486783}
  • Loading branch information
Yipeng Wang authored and Commit Bot committed Jul 14, 2017
1 parent 82b35f8 commit 21707ea
Show file tree
Hide file tree
Showing 12 changed files with 9 additions and 1,384 deletions.
26 changes: 3 additions & 23 deletions android_webview/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,6 @@ repack("repack_100_percent") {
}
}

webview_license_path = "$target_gen_dir/webview_licenses.notice"

android_assets("pak_file_assets") {
sources = [
"$target_gen_dir/chrome_100_percent.pak",
Expand Down Expand Up @@ -222,28 +220,10 @@ java_group("stub_assets") {
}

android_assets("license_assets") {
sources = [
webview_license_path,
]
renaming_sources = [ "$root_gen_dir/components/resources/about_credits.html" ]
renaming_destinations = [ "webview_licenses.notice" ]
deps = [
":generate_webview_license_notice",
]
}

action("generate_webview_license_notice") {
script = "tools/webview_licenses.py"
depfile = "$target_gen_dir/$target_name.d"
inputs = [
"tools/licenses_notice.tmpl",
]
outputs = [
webview_license_path,
]
args = [
"notice",
rebase_path(webview_license_path, root_build_dir),
"--depfile",
rebase_path(depfile, root_build_dir),
"//components/resources:about_credits",
]
}

Expand Down
1 change: 0 additions & 1 deletion android_webview/tools/PRESUBMIT.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ def CommonChecks(input_api, output_api):
input_api, output_api, pylintrc='pylintrc',
# TODO: lint these and eliminate the blacklist.
black_list=[
r'webview_licenses.py',
r'webview_repack_locales.py',
]))
return input_api.RunTests(checks, False)
Expand Down
303 changes: 0 additions & 303 deletions android_webview/tools/webview_licenses.py

This file was deleted.

17 changes: 0 additions & 17 deletions docs/adding_to_third_party.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,6 @@ Run the following scripts:
about:credits page in Google Chrome builds.
* `src/tools/checklicenses/checklicenses.py` - See below for info on how to
handle possible failures.
* If you are adding code that will be present in the content layer, please make
sure that the license used is compliant with Android tree requirements because
this code will also be used in Android WebView. You need to run
`src/android_webview/tools/webview_licenses.py scan`

See the ["Odds n' Ends"](adding_to_third_party.md#Odds-n_Ends) Section below if
you run into any failures running these.
Expand Down Expand Up @@ -187,16 +183,3 @@ __If the failure looks like ... ... the right action is to ... __
resulting binaries can't use GPL code. Ideally we just shouldn't have
those files at all in the tree. If in doubt, please ask mal@chromium.org

### Handling `webview_licenses.py` failures

__If the failure looks like ... ... the right action is to ... __

* Missing license file
* Make sure that the license file is present. It should be called 'LICENSE',
or otherwise README.chromium file must point to it explicitly.
* The following files contain a third-party license but are not in a listed
third-party directory...
* Check if it's a false positive (e.g. 'copyright' word used in a string
literal), if so, update
[src/tools/copyright_scanner/third_party_files_whitelist.txt](https://code.google.com/p/chromium/codesearch#chromium/src/tools/copyright_scanner/third_party_files_whitelist.txt)
file. Otherwise, please move the code into third_party.
Loading

0 comments on commit 21707ea

Please sign in to comment.