| OLD | NEW | 
|---|
| 1 # This file contains dependencies for WebRTC that are not shared with Chromium. | 1 # This file contains dependencies for WebRTC that are not shared with Chromium. | 
| 2 # If you wish to add a dependency that is present in Chromium's src/DEPS or a | 2 # If you wish to add a dependency that is present in Chromium's src/DEPS or a | 
| 3 # directory from the Chromium checkout, you should add it to setup_links.py | 3 # directory from the Chromium checkout, you should add it to setup_links.py | 
| 4 # instead. | 4 # instead. | 
| 5 | 5 | 
| 6 vars = { | 6 vars = { | 
| 7   'extra_gyp_flag': '-Dextra_gyp_flag=0', | 7   'extra_gyp_flag': '-Dextra_gyp_flag=0', | 
| 8   'chromium_git': 'https://chromium.googlesource.com', | 8   'chromium_git': 'https://chromium.googlesource.com', | 
| 9   'chromium_revision': 'a31042286f1978cfed1546b500db62a96fa9e5c6', | 9   'chromium_revision': 'a31042286f1978cfed1546b500db62a96fa9e5c6', | 
| 10 } | 10 } | 
| 11 | 11 | 
| 12 # NOTE: Use http rather than https; the latter can cause problems for users | 12 # NOTE: Use http rather than https; the latter can cause problems for users | 
| 13 # behind proxies. | 13 # behind proxies. | 
| 14 deps = { | 14 deps = { | 
| 15   'src/third_party/gflags/src': | 15   'src/third_party/gflags/src': | 
| 16     Var('chromium_git') + '/external/github.com/gflags/gflags@03bebcb065c83beff8
     3d50ae025a55a4bf94dfca', | 16     Var('chromium_git') + '/external/github.com/gflags/gflags@03bebcb065c83beff8
     3d50ae025a55a4bf94dfca', | 
| 17 } | 17 } | 
| 18 | 18 | 
| 19 deps_os = { | 19 deps_os = { | 
| 20   'win': { | 20   'win': { | 
| 21     'src/third_party/winsdk_samples/src': | 21     'src/third_party/winsdk_samples/src': | 
| 22       Var('chromium_git') + '/external/webrtc/deps/third_party/winsdk_samples_v7
     1@e71b549167a665d7424d6f1dadfbff4b4aad1589', | 22       Var('chromium_git') + '/external/webrtc/deps/third_party/winsdk_samples_v7
     1@e71b549167a665d7424d6f1dadfbff4b4aad1589', | 
| 23   }, | 23   }, | 
| 24 } | 24 } | 
| 25 | 25 | 
| 26 # Define rules for which include paths are allowed in our source. |  | 
| 27 include_rules = [ |  | 
| 28   # Base is only used to build Android APK tests and may not be referenced by |  | 
| 29   # WebRTC production code. |  | 
| 30   '-base', |  | 
| 31   '-chromium', |  | 
| 32   '+external/webrtc/webrtc',  # Android platform build. |  | 
| 33   '+gflags', |  | 
| 34   '+libyuv', |  | 
| 35   '+net', |  | 
| 36   '+talk', |  | 
| 37   '+testing', |  | 
| 38   '+third_party', |  | 
| 39   '+unicode', |  | 
| 40   '+usrsctplib', |  | 
| 41   '+webrtc', |  | 
| 42   '+vpx', |  | 
| 43 ] |  | 
| 44 |  | 
| 45 hooks = [ | 26 hooks = [ | 
| 46   { | 27   { | 
| 47     # Check for legacy named top-level dir (named 'trunk'). | 28     # Check for legacy named top-level dir (named 'trunk'). | 
| 48     'name': 'check_root_dir_name', | 29     'name': 'check_root_dir_name', | 
| 49     'pattern': '.', | 30     'pattern': '.', | 
| 50     'action': ['python','-c', | 31     'action': ['python','-c', | 
| 51                ('import os,sys;' | 32                ('import os,sys;' | 
| 52                 'script = os.path.join("trunk","check_root_dir.py");' | 33                 'script = os.path.join("trunk","check_root_dir.py");' | 
| 53                 '_ = os.system("%s %s" % (sys.executable,script)) ' | 34                 '_ = os.system("%s %s" % (sys.executable,script)) ' | 
| 54                 'if os.path.exists(script) else 0')], | 35                 'if os.path.exists(script) else 0')], | 
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 104   }, | 85   }, | 
| 105   { | 86   { | 
| 106     # A change to a .gyp, .gypi, or to GYP itself should run the generator. | 87     # A change to a .gyp, .gypi, or to GYP itself should run the generator. | 
| 107     'name': 'gyp', | 88     'name': 'gyp', | 
| 108     'pattern': '.', | 89     'pattern': '.', | 
| 109     'action': ['python', 'src/webrtc/build/gyp_webrtc', | 90     'action': ['python', 'src/webrtc/build/gyp_webrtc', | 
| 110                Var('extra_gyp_flag')], | 91                Var('extra_gyp_flag')], | 
| 111   }, | 92   }, | 
| 112 ] | 93 ] | 
| 113 | 94 | 
| OLD | NEW | 
|---|