coffee/libyuv
1
0
Fork 0
mirror of https://chromium.googlesource.com/libyuv/libyuv synced 2026-01-01 03:12:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix DEPS and gyp_libyuv for chromium roll in r996

Browse Source 
The roll in r996 requires some additional changes in order
to make the GYP generation script to run properly.

BUG=none
TESTED=trybots passing.
R=fbarchard@google.com

Review URL: https://webrtc-codereview.appspot.com/10799005

git-svn-id: http://libyuv.googlecode.com/svn/trunk@997 16f28f9a-4ce2-e073-06de-1de4eb20be90
This commit is contained in:
kjellander@google.com 2014-04-02 18:01:51 +00:00
parent 5340da6323
commit 973da212e6
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
DEPS
View File

@ -125,7 +125,7 @@ hooks = [
# Pull GN binaries. This needs to be before running GYP below. # Pull GN binaries. This needs to be before running GYP below.
{ {
"name": "gn_win", "name": "gn_win",
"pattern": "tools/gn/bin/win/gn.exe.sha1", "pattern": ".",
"action": [ "download_from_google_storage", "action": [ "download_from_google_storage",
"--no_resume", "--no_resume",
"--platform=win32", "--platform=win32",
@ -136,7 +136,7 @@ hooks = [
}, },
{ {
"name": "gn_mac", "name": "gn_mac",
"pattern": "tools/gn/bin/mac/gn.sha1", "pattern": ".",
"action": [ "download_from_google_storage", "action": [ "download_from_google_storage",
"--no_resume", "--no_resume",
"--platform=darwin", "--platform=darwin",
@ -147,7 +147,7 @@ hooks = [
}, },
{ {
"name": "gn_linux", "name": "gn_linux",
"pattern": "tools/gn/bin/linux/gn.sha1", "pattern": ".",
"action": [ "download_from_google_storage", "action": [ "download_from_google_storage",
"--no_resume", "--no_resume",
"--platform=linux*", "--platform=linux*",
@ -158,7 +158,7 @@ hooks = [
}, },
{ {
"name": "gn_linux32", "name": "gn_linux32",
"pattern": "tools/gn/bin/linux/gn32.sha1", "pattern": ".",
"action": [ "download_from_google_storage", "action": [ "download_from_google_storage",
"--no_resume", "--no_resume",
"--platform=linux*", "--platform=linux*",
@ -172,7 +172,7 @@ hooks = [
# zero seconds to run. If something changed, it downloads a prebuilt clang. # zero seconds to run. If something changed, it downloads a prebuilt clang.
"pattern": ".", "pattern": ".",
"action": ["python", Var("root_dir") + "/tools/clang/scripts/update.py", "action": ["python", Var("root_dir") + "/tools/clang/scripts/update.py",
"--mac-only"], "--if-needed"],
}, },
{ {
# A change to a .gyp, .gypi, or to GYP itself should run the generator. # A change to a .gyp, .gypi, or to GYP itself should run the generator.

11
gyp_libyuv
View File

@ -22,6 +22,7 @@ sys.path.insert(0, os.path.join(checkout_root, 'build'))
sys.path.insert(0, os.path.join(checkout_root, 'tools', 'find_depot_tools')) sys.path.insert(0, os.path.join(checkout_root, 'tools', 'find_depot_tools'))
import gyp_chromium import gyp_chromium
import gyp_helper import gyp_helper
import vs_toolchain
sys.path.insert(0, os.path.join(checkout_root, 'tools', 'gyp', 'pylib')) sys.path.insert(0, os.path.join(checkout_root, 'tools', 'gyp', 'pylib'))
import gyp import gyp
@ -49,22 +50,20 @@ if __name__ == '__main__':
if not os.environ.get('GYP_GENERATORS'): if not os.environ.get('GYP_GENERATORS'):
os.environ['GYP_GENERATORS'] = 'ninja' os.environ['GYP_GENERATORS'] = 'ninja'
vs2013_runtime_dll_dirs = gyp_chromium.DownloadVsToolChain() vs2013_runtime_dll_dirs = vs_toolchain.DownloadVsToolchain()
# Enforce gyp syntax checking. This adds about 20% execution time. # Enforce gyp syntax checking. This adds about 20% execution time.
args.append('--check') args.append('--check')
supplemental_includes = gyp_chromium.GetSupplementalFiles() supplemental_includes = gyp_chromium.GetSupplementalFiles()
gn_vars_dict = gyp_chromium.GetGypVarsForGN(supplemental_includes) gyp_vars_dict = gyp_chromium.GetGypVars(supplemental_includes)
# Automatically turn on crosscompile support for platforms that need it. # Automatically turn on crosscompile support for platforms that need it.
if all(('ninja' in os.environ.get('GYP_GENERATORS', ''), if all(('ninja' in os.environ.get('GYP_GENERATORS', ''),
gn_vars_dict.get('OS') in ['android', 'ios'], gyp_vars_dict.get('OS') in ['android', 'ios'],
'GYP_CROSSCOMPILE' not in os.environ)): 'GYP_CROSSCOMPILE' not in os.environ)):
os.environ['GYP_CROSSCOMPILE'] = '1' os.environ['GYP_CROSSCOMPILE'] = '1'
if not gyp_chromium.RunGN(gn_vars_dict):
sys.exit(1)
args.extend(['-I' + i for i in args.extend(['-I' + i for i in
gyp_chromium.additional_include_files(supplemental_includes, gyp_chromium.additional_include_files(supplemental_includes,
args)]) args)])
@ -80,7 +79,7 @@ if __name__ == '__main__':
if vs2013_runtime_dll_dirs: if vs2013_runtime_dll_dirs:
x64_runtime, x86_runtime = vs2013_runtime_dll_dirs x64_runtime, x86_runtime = vs2013_runtime_dll_dirs
gyp_chromium.CopyVsRuntimeDlls( vs_toolchain.CopyVsRuntimeDlls(
os.path.join(checkout_root, gyp_chromium.GetOutputDirectory()), os.path.join(checkout_root, gyp_chromium.GetOutputDirectory()),
(x86_runtime, x64_runtime)) (x86_runtime, x64_runtime))