diff options
| author | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-22 15:52:41 +0000 |
|---|---|---|
| committer | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-22 15:52:41 +0000 |
| commit | 589f3ffcc193fa8152c41a1f6316ce4602ec9b04 (patch) | |
| tree | 3602596e03d0551f686d3b2e5da91a07ead13ce2 /android_webview | |
| parent | ebd7e5d33a417a27a6f8e5ab1155f09fb11aca51 (diff) | |
| download | chromium_src-589f3ffcc193fa8152c41a1f6316ce4602ec9b04.zip chromium_src-589f3ffcc193fa8152c41a1f6316ce4602ec9b04.tar.gz chromium_src-589f3ffcc193fa8152c41a1f6316ce4602ec9b04.tar.bz2 | |
[Android] Update the third-party licensing whitelist
Updating after the following list of commits:
https://chromiumcodereview.appspot.com/10825362
https://chromiumcodereview.appspot.com/10827427
https://chromiumcodereview.appspot.com/10829327
https://chromiumcodereview.appspot.com/10834354
Review URL: https://chromiumcodereview.appspot.com/10871015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152773 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/tools/third_party_files_whitelist.txt | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/android_webview/tools/third_party_files_whitelist.txt b/android_webview/tools/third_party_files_whitelist.txt index cd63150..90a9e9b 100644 --- a/android_webview/tools/third_party_files_whitelist.txt +++ b/android_webview/tools/third_party_files_whitelist.txt @@ -31,10 +31,6 @@ base/file_version_info_win.h base/i18n/icu_string_conversions.cc # Copyright Ron Rivest, public domain. base/md5.cc -# Copyright The Chromium Authors and The Free Software Foundation; GPL v3 -# license. Not used on Android. TODO(steveblock): Exclude this from the WebView -# snapshot (https://chromiumcodereview.appspot.com/10695024). -build/gdb-add-index # String 'copyright' used in resources. chrome/app/chrome_version.rc.version # String 'copyright' used in resources. @@ -86,7 +82,9 @@ chrome/browser/resources/about_version.html # Credits notice for ChromeOS. chrome/browser/resources/chromeos/about_os_credits.html # String 'copyright' used in code. -chrome/browser/resources/file_manager/js/image_editor/gallery_scripts.js +chrome/browser/resources/file_manager/js/action_choice_scripts.js +# String 'copyright' used in code. +chrome/browser/resources/file_manager/js/photo/gallery_scripts.js # String 'copyright' used in code. chrome/browser/resources/file_manager/js/main_scripts.js # String 'copyright' used in code. @@ -211,9 +209,9 @@ net/proxy/proxy_resolver_script.h # and (MPL, GPL v2 or LGPL v2) licenses. Not used on Android. net/socket/ssl_client_socket_nss.cc # String 'copyright' used in resources. -remoting/chromium_branding +remoting/branding_Chrome # String 'copyright' used in resources. -remoting/google_chrome_branding +remoting/branding_Chromium # String 'copyright' used in project file. remoting/host/installer/mac/ChromotingHost.packproj # String 'copyright' used in project file. |