diff options
| -rwxr-xr-x | chromium/tools/licenses.py | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/chromium/tools/licenses.py b/chromium/tools/licenses.py index 3862aa0a9f6..6b8ec508779 100755 --- a/chromium/tools/licenses.py +++ b/chromium/tools/licenses.py @@ -25,11 +25,7 @@ import subprocess import sys import tempfile -# TODO(agrieve): Move build_utils.WriteDepFile into a non-android directory. _REPOSITORY_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__))) -sys.path.append(os.path.join(_REPOSITORY_ROOT, 'build/android/gyp/util')) -import build_utils - # Paths from the root of the tree to directories to skip. PRUNE_PATHS = set([ @@ -654,19 +650,6 @@ def GenerateCredits( else: print template_contents - if depfile: - assert output_file - # Add in build.ninja so that the target will be considered dirty whenever - # gn gen is run. Otherwise, it will fail to notice new files being added. - # This is still no perfect, as it will fail if no build files are changed, - # but a new README.chromium / LICENSE is added. This shouldn't happen in - # practice however. - license_file_list = (entry['license_file'] for entry in entries) - license_file_list = (os.path.relpath(p) for p in license_file_list) - license_file_list = sorted(set(license_file_list)) - build_utils.WriteDepfile(depfile, output_file, - license_file_list + ['build.ninja']) - return True @@ -732,7 +715,6 @@ def main(): parser.add_argument('command', choices=['help', 'scan', 'credits', 'license_file']) parser.add_argument('output_file', nargs='?') - build_utils.AddDepfileOption(parser) args = parser.parse_args() if args.command == 'scan': @@ -741,7 +723,7 @@ def main(): elif args.command == 'credits': if not GenerateCredits(args.file_template, args.entry_template, args.output_file, args.target_os, - args.gn_out_dir, args.gn_target, args.depfile): + args.gn_out_dir, args.gn_target): return 1 elif args.command == 'license_file': if not GenerateLicenseFile( |