| 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': '390847b60c7d8a829c9a28c7c2f6d4a707080fd7', |    9   'chromium_revision': '390847b60c7d8a829c9a28c7c2f6d4a707080fd7', | 
|   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  | 
|   26 hooks = [ |   45 hooks = [ | 
|   27   { |   46   { | 
|   28     # Check for legacy named top-level dir (named 'trunk'). |   47     # Check for legacy named top-level dir (named 'trunk'). | 
|   29     'name': 'check_root_dir_name', |   48     'name': 'check_root_dir_name', | 
|   30     'pattern': '.', |   49     'pattern': '.', | 
|   31     'action': ['python','-c', |   50     'action': ['python','-c', | 
|   32                ('import os,sys;' |   51                ('import os,sys;' | 
|   33                 'script = os.path.join("trunk","check_root_dir.py");' |   52                 'script = os.path.join("trunk","check_root_dir.py");' | 
|   34                 '_ = os.system("%s %s" % (sys.executable,script)) ' |   53                 '_ = os.system("%s %s" % (sys.executable,script)) ' | 
|   35                 'if os.path.exists(script) else 0')], |   54                 'if os.path.exists(script) else 0')], | 
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   85   }, |  104   }, | 
|   86   { |  105   { | 
|   87     # A change to a .gyp, .gypi, or to GYP itself should run the generator. |  106     # A change to a .gyp, .gypi, or to GYP itself should run the generator. | 
|   88     'name': 'gyp', |  107     'name': 'gyp', | 
|   89     'pattern': '.', |  108     'pattern': '.', | 
|   90     'action': ['python', 'src/webrtc/build/gyp_webrtc', |  109     'action': ['python', 'src/webrtc/build/gyp_webrtc', | 
|   91                Var('extra_gyp_flag')], |  110                Var('extra_gyp_flag')], | 
|   92   }, |  111   }, | 
|   93 ] |  112 ] | 
|   94  |  113  | 
| OLD | NEW |