Svmp 2.x

.gitignore

@@ -53,17 +53,20 @@
 /third_party/android_testrunner
 /third_party/android_tools
 /third_party/asan
+/third_party/binutils
 /third_party/clang_format
+/third_party/colorama
 /third_party/cygwin
 /third_party/directxsdk
 /third_party/expat
 /third_party/gaeunit
 /third_party/gflags/src
-/third_party/gold
 /third_party/google-visualization-python
 /third_party/icu
 /third_party/jsoncpp
 /third_party/junit
+/third_party/libc++
+/third_party/libc++abi
 /third_party/libjingle
 /third_party/libjpeg
 /third_party/libjpeg_turbo
@@ -74,6 +77,7 @@
 /third_party/llvm-build
 /third_party/nss
 /third_party/oauth2
+/third_party/openmax_dl
 /third_party/openssl
 /third_party/opus
 /third_party/protobuf
@@ -87,13 +91,16 @@
 /tools/android-dummy-test
 /tools/clang
 /tools/find_depot_tools
+/tools/generate_library_loader
 /tools/gn
 /tools/grit
 /tools/gritsettings
 /tools/gyp
 /tools/protoc_wrapper
 /tools/python
+/tools/sanitizer_options
 /tools/swarming_client
+/tools/tsan_suppressions
 /tools/valgrind
 /tools/win
 /webrtc/examples/android/media_demo/bin

AUTHORS

@@ -3,12 +3,14 @@
 
 Anil Kumar <an1kumar@gmail.com>
 Ben Strong <bstrong@gmail.com>
+Bridger Maxwell <bridgeyman@gmail.com>
 Christophe Dumez <ch.dumez@samsung.com>
 Eric Rescorla, RTFM Inc.
 Jie Mao <maojie0924@gmail.com>
 Luke Weber
 Martin Storsjo <martin@martin.st>
 Pali Rohar
+Paul Kapustin <pkapustin@gmail.com>
 Rafael Lopez Diez <rafalopezdiez@gmail.com>
 Robert Nagy
 Silviu Caragea <silviu.cpp@gmail.com>

BUILD.gn

@@ -8,16 +8,7 @@
 
 # This file is copied and modified from Chromium (src/BUILD.gn).
 group("root") {
-  external = true
-
   deps = [
+    "//webrtc",
   ]
 }
-
-# A standard (non-group) target is required in the build to load any of the
-# configurations, which is in turn required to load all of the build parameters
-# (in build/config/BUILD.gn).
-executable("dummy") {
-  external = true
-}
-

DEPS

@@ -11,7 +11,7 @@ vars = {
   "googlecode_url": "http://%s.googlecode.com/svn",
   "sourceforge_url": "http://svn.code.sf.net/p/%(repo)s/code",
   "chromium_trunk" : "http://src.chromium.org/svn/trunk",
-  "chromium_revision": "260462",
+  "chromium_revision": "277350",
 
   # A small subset of WebKit is needed for the Android Python test framework.
   "webkit_trunk": "http://src.chromium.org/blink/trunk",
@@ -42,12 +42,18 @@ deps = {
   "testing/gtest":
     From("chromium_deps", "src/testing/gtest"),
 
+  "third_party/binutils":
+    Var("chromium_trunk") + "/src/third_party/binutils@" + Var("chromium_revision"),
+
   "third_party/clang_format":
     Var("chromium_trunk") + "/src/third_party/clang_format@" + Var("chromium_revision"),
 
   "third_party/clang_format/script":
     From("chromium_deps", "src/third_party/clang_format/script"),
 
+  "third_party/colorama/src":
+    From("chromium_deps", "src/third_party/colorama/src"),
+
   "third_party/expat":
     Var("chromium_trunk") + "/src/third_party/expat@" + Var("chromium_revision"),
 
@@ -67,6 +73,21 @@ deps = {
   "third_party/junit/":
     (Var("googlecode_url") % "webrtc") + "/deps/third_party/junit@3367",
 
+  "third_party/libc++":
+    Var("chromium_trunk") + "/src/third_party/libc++@" + Var("chromium_revision"),
+
+  "third_party/libc++/trunk":
+    From("chromium_deps", "src/third_party/libc++/trunk"),
+
+  "third_party/libc++abi":
+    Var("chromium_trunk") + "/src/third_party/libc++abi@" + Var("chromium_revision"),
+
+  "third_party/libc++abi/trunk":
+    From("chromium_deps", "src/third_party/libc++abi/trunk"),
+
+  "third_party/openmax_dl/":
+    (Var("googlecode_url") % "webrtc") + "/deps/third_party/openmax@6096",
+
   "third_party/libjpeg":
     Var("chromium_trunk") + "/src/third_party/libjpeg@" + Var("chromium_revision"),
 
@@ -77,19 +98,19 @@ deps = {
     From("chromium_deps", "src/third_party/libsrtp"),
 
   "third_party/libvpx":
-    Var("chromium_trunk") + "/deps/third_party/libvpx@259973",
+    Var("chromium_trunk") + "/deps/third_party/libvpx@278497",
 
   "third_party/libyuv":
-    (Var("googlecode_url") % "libyuv") + "/trunk@994",
+    (Var("googlecode_url") % "libyuv") + "/trunk@1000",
 
   "third_party/opus":
-    Var("chromium_trunk") + "/src/third_party/opus@258909",
+    Var("chromium_trunk") + "/src/third_party/opus@277414",
 
   "third_party/opus/src":
     Var("chromium_trunk") + "/deps/third_party/opus@256783",
 
   "third_party/protobuf":
-    Var("chromium_trunk") + "/src/third_party/protobuf@251211",
+    Var("chromium_trunk") + "/src/third_party/protobuf@" + Var("chromium_revision"),
 
   "third_party/sqlite/":
     Var("chromium_trunk") + "/src/third_party/sqlite@" + Var("chromium_revision"),
@@ -103,6 +124,9 @@ deps = {
   "tools/clang":
     Var("chromium_trunk") + "/src/tools/clang@" + Var("chromium_revision"),
 
+  "tools/generate_library_loader":
+    Var("chromium_trunk") + "/src/tools/generate_library_loader@" + Var("chromium_revision"),
+
   "tools/gn":
     Var("chromium_trunk") + "/src/tools/gn@" + Var("chromium_revision"),
 
@@ -115,9 +139,15 @@ deps = {
   "tools/python":
     Var("chromium_trunk") + "/src/tools/python@" + Var("chromium_revision"),
 
+  "tools/sanitizer_options":
+    File(Var("chromium_trunk") + "/src/base/debug/sanitizer_options.cc@" + Var("chromium_revision")),
+
   "tools/swarming_client":
     From("chromium_deps", "src/tools/swarming_client"),
 
+  "tools/tsan_suppressions":
+    File(Var("chromium_trunk") + "/src/base/debug/tsan_suppressions.cc@" + Var("chromium_revision")),
+
   "tools/valgrind":
     Var("chromium_trunk") + "/src/tools/valgrind@" + Var("chromium_revision"),
 
@@ -132,11 +162,14 @@ deps = {
     Var("chromium_trunk") + "/src/third_party/usrsctp@" + Var("chromium_revision"),
 
   "third_party/usrsctp/usrsctplib":
-    (Var("googlecode_url") % "sctp-refimpl") + "/trunk/KERN/usrsctp/usrsctplib@8723",
+    (Var("googlecode_url") % "sctp-refimpl") + "/trunk/KERN/usrsctp/usrsctplib@8875",
 }
 
 deps_os = {
   "win": {
+    "third_party/drmemory":
+      Var("chromium_trunk") + "/src/third_party/drmemory@" + Var("chromium_revision"),
+
     "third_party/winsdk_samples/src":
       (Var("googlecode_url") % "webrtc") + "/deps/third_party/winsdk_samples_v71@3145",
 
@@ -148,10 +181,6 @@ deps_os = {
     "third_party/nss":
       From("chromium_deps", "src/third_party/nss"),
 
-    # SyzyASan to make it possible to run tests under ASan on Windows.
-    "third_party/syzygy/binaries":
-      From("chromium_deps", "src/third_party/syzygy/binaries"),
-
     "tools/find_depot_tools":
       File(Var("chromium_trunk") + "/src/tools/find_depot_tools.py@" + Var("chromium_revision")),
   },
@@ -160,6 +189,12 @@ deps_os = {
     # NSS, for SSLClientSocketNSS.
     "third_party/nss":
       From("chromium_deps", "src/third_party/nss"),
+
+    # TODO(kjellander): remove once bug 2152 is fixed.
+    # This needs to specify the path directly (instead of using the
+    # chromium_deps version) because chromium_deps only defines this for ios.
+    "testing/iossim/third_party/class-dump":
+      Var("chromium_trunk") + "/deps/third_party/class-dump@199203",
   },
 
   "ios": {
@@ -176,16 +211,11 @@ deps_os = {
       Var("chromium_trunk") + "/src/testing/iossim@" + Var("chromium_revision"),
   },
 
-  "unix": {
-    "third_party/gold":
-      From("chromium_deps", "src/third_party/gold"),
-  },
-
   "android": {
     # Precompiled tools needed for Android test execution. Needed since we can't
     # compile them from source in WebRTC since they depend on Chromium's base.
     "tools/android":
-      (Var("googlecode_url") % "webrtc") + "/deps/tools/android@4258",
+      (Var("googlecode_url") % "webrtc") + "/deps/tools/android@6306",
 
     "tools/android-dummy-test":
       (Var("googlecode_url") % "webrtc") + "/deps/tools/android-dummy-test@4244",
@@ -298,6 +328,42 @@ hooks = [
     "action": ["python", Var("root_dir") + "/tools/clang/scripts/update.py",
                "--if-needed"],
   },
+  {
+    # Update the Windows toolchain if necessary.
+    "name": "win_toolchain",
+    "pattern": ".",
+    "action": ["python",
+               Var("root_dir") + "/webrtc/build/download_vs_toolchain.py",
+               "update"],
+  },
+  {
+    # Pull binutils for gold.
+    "name": "binutils",
+    "pattern": ".",
+    "action": ["python", Var("root_dir") + "/third_party/binutils/download.py"],
+  },
+  {
+    "name": "drmemory",
+    "pattern": ".",
+    "action": [ "download_from_google_storage",
+                "--no_resume",
+                "--platform=win32",
+                "--no_auth",
+                "--bucket", "chromium-drmemory",
+                "-s", Var("root_dir") + "/third_party/drmemory/drmemory-windows-sfx.exe.sha1",
+    ],
+  },
+  {
+    # Pull the Syzygy binaries, used for optimization and instrumentation.
+    "name": "syzygy-binaries",
+    "pattern": ".",
+    "action": ["python",
+               Var("root_dir") + "/build/get_syzygy_binaries.py",
+               "--output-dir=%s/third_party/syzygy/binaries" % Var("root_dir"),
+               "--revision=b08fb72610963d31cc3eae33f746a04e263bd860",
+               "--overwrite",
+    ],
+  },
   {
     # Download test resources, i.e. video and audio files from Google Storage.
     "pattern": "\\.sha1",

OWNERS

@@ -4,9 +4,9 @@ mflodman@webrtc.org
 niklas.enbom@webrtc.org
 tina.legrand@webrtc.org
 tommi@webrtc.org
-per-file *.isolate=kjellander@webrtc.org
 per-file .gitignore=*
 per-file AUTHORS=*
+per-file BUILD.gn=kjellander@webrtc.org
 per-file DEPS=*
 per-file WATCHLISTS=*
 per-file webrtc_examples.gyp=*

PRESUBMIT.py

@@ -93,23 +93,6 @@ def _CheckApprovedFilesLintClean(input_api, output_api,
 
   return result
 
-def _CheckTalkOrWebrtcOnly(input_api, output_api):
-  base_folders = set(["webrtc", "talk"])
-  base_folders_in_cl = set()
-
-  for f in input_api.AffectedFiles():
-    full_path = f.LocalPath()
-    base_folders_in_cl.add(full_path[:full_path.find('/')])
-
-  results = []
-  if base_folders.issubset(base_folders_in_cl):
-    error_type = output_api.PresubmitError
-    results.append(error_type(
-        'It is not allowed to check in files to ' + ', '.join(base_folders) +
-        ' in the same cl',
-        []))
-  return results
-
 def _CommonChecks(input_api, output_api):
   """Checks common to both upload and commit."""
   # TODO(kjellander): Use presubmit_canned_checks.PanProjectChecks too.
@@ -151,7 +134,6 @@ def _CommonChecks(input_api, output_api):
   results.extend(_CheckApprovedFilesLintClean(input_api, output_api))
   results.extend(_CheckNoIOStreamInHeaders(input_api, output_api))
   results.extend(_CheckNoFRIEND_TEST(input_api, output_api))
-  results.extend(_CheckTalkOrWebrtcOnly(input_api, output_api))
   return results
 
 def CheckChangeOnUpload(input_api, output_api):
@@ -190,6 +172,7 @@ def GetPreferredTryMasters(project, change):
 
   android_bots = [
       'android',
+      'android_arm64',
       'android_apk',
       'android_apk_rel',
       'android_rel',
@@ -205,7 +188,6 @@ def GetPreferredTryMasters(project, change):
       'linux_baremetal',
       'linux_memcheck',
       'linux_rel',
-      'linux_tsan',
       'linux_tsan2',
   ]
   mac_bots = [
@@ -219,6 +201,7 @@ def GetPreferredTryMasters(project, change):
       'win',
       'win_asan',
       'win_baremetal',
+      'win_drmemory_light',
       'win_rel',
       'win_x64_rel',
   ]