Update libchromiumcontent for filenames.gypi fix
This commit is contained in:
parent
93ebbb1c86
commit
7720346ee7
2 changed files with 17 additions and 16 deletions
|
@ -68,21 +68,22 @@ def setup_libchromiumcontent(is_dev, commit, target_arch, url,
|
|||
libcc_source_path,
|
||||
libcc_shared_library_path,
|
||||
libcc_static_library_path):
|
||||
mkdir_p(DOWNLOAD_DIR)
|
||||
target_dir = os.path.join(DOWNLOAD_DIR, 'libchromiumcontent')
|
||||
download = os.path.join(VENDOR_DIR, 'libchromiumcontent', 'script',
|
||||
'download')
|
||||
args = ['-f', '-c', commit, '--target_arch', target_arch, url, target_dir]
|
||||
if (libcc_source_path != None and
|
||||
libcc_shared_library_path != None and
|
||||
libcc_static_library_path != None):
|
||||
args.append(['--libcc_source_path', libcc_source_path,
|
||||
'--libcc_shared_library_path', libcc_shared_library_path,
|
||||
'--libcc_static_library_path', libcc_static_library_path])
|
||||
if is_dev:
|
||||
subprocess.check_call([sys.executable, download] + args)
|
||||
else:
|
||||
subprocess.check_call([sys.executable, download, '-s'] + args)
|
||||
mkdir_p(DOWNLOAD_DIR)
|
||||
target_dir = os.path.join(DOWNLOAD_DIR, 'libchromiumcontent')
|
||||
download = os.path.join(VENDOR_DIR, 'libchromiumcontent', 'script',
|
||||
'download')
|
||||
args = ['-f', '-c', commit, '--target_arch', target_arch, url, target_dir]
|
||||
if (libcc_source_path != None and
|
||||
libcc_shared_library_path != None and
|
||||
libcc_static_library_path != None):
|
||||
args.append(['--libcc_source_path', libcc_source_path,
|
||||
'--libcc_shared_library_path', libcc_shared_library_path,
|
||||
'--libcc_static_library_path', libcc_static_library_path])
|
||||
if is_dev:
|
||||
subprocess.check_call([sys.executable, download] + args)
|
||||
else:
|
||||
subprocess.check_call([sys.executable, download, '-s'] + args)
|
||||
|
||||
|
||||
def mkdir_p(path):
|
||||
try:
|
||||
|
|
2
brightray/vendor/libchromiumcontent
vendored
2
brightray/vendor/libchromiumcontent
vendored
|
@ -1 +1 @@
|
|||
Subproject commit 2bf9a031b05c9f8b08e4370f87f9d06cd1676cad
|
||||
Subproject commit f202592f932cfb8494cc6fa211f9b917f2457f3b
|
Loading…
Reference in a new issue