diff options
| author | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-05 08:47:59 +0000 |
|---|---|---|
| committer | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-05 08:47:59 +0000 |
| commit | b123de2998760eaa905a61d6231784b6de653e53 (patch) | |
| tree | 3db32c41e1f9c8794da465515dd0dc57d2de3ad8 /third_party/zlib/zconf.h | |
| parent | 60fe6a4ab9f4a3a034551e63a5625f8aed7ab076 (diff) | |
| download | chromium_src-b123de2998760eaa905a61d6231784b6de653e53.zip chromium_src-b123de2998760eaa905a61d6231784b6de653e53.tar.gz chromium_src-b123de2998760eaa905a61d6231784b6de653e53.tar.bz2 | |
[Android WebView] Fix small licenses-related inconsistencies
1) Add Apple PSL 2 (APSL 2) license into the whitelist.
2) Fix breakpad's "License" field to be "New BSD, Apple PSL 2.0 and Apache 2.0".
Dropped "MIT/X derivate" because I've found no mentions of it in the project.
3) Fix webdriver's "License" field to be "Apache 2, MIT and GPL v2". The latter
corresponds to old jQuery code, which was previously licensed under GPL v2, not
GPL, as the field was stating.
These changes make "breakpad" and "webdriver" projects to be recognized as
"compatible" with the Android tree.
R=frankf@chromium.org, mkosiba@chromium.org, thestig@chromium.org
Review URL: https://codereview.chromium.org/135533007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@248928 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/zlib/zconf.h')
0 files changed, 0 insertions, 0 deletions