diff --git a/DEPS b/DEPS index 45694cfb2..03bfb71da 100644 --- a/DEPS +++ b/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": "245382", + "chromium_revision": "249215", # A small subset of WebKit is needed for the Android Python test framework. "webkit_trunk": "http://src.chromium.org/blink/trunk", @@ -45,6 +45,9 @@ deps = { "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/expat": Var("chromium_trunk") + "/src/third_party/expat@" + Var("chromium_revision"), @@ -135,10 +138,6 @@ deps = { deps_os = { "win": { - # Use our own, stripped down, version of Cygwin (required by GYP). - "third_party/cygwin": - (Var("googlecode_url") % "webrtc") + "/deps/third_party/cygwin@2672", - "third_party/winsdk_samples/src": (Var("googlecode_url") % "webrtc") + "/deps/third_party/winsdk_samples_v71@3145", @@ -295,15 +294,6 @@ hooks = [ "action": ["python", Var("root_dir") + "/tools/clang/scripts/update.py", "--mac-only"], }, - { - # Update the cygwin mount on Windows. - # This is necessary to get the correct mapping between e.g. /bin and the - # cygwin path on Windows. Without it we can't run bash scripts in actions. - # Ideally this should be solved in "pylib/gyp/msvs_emulation.py". - "pattern": ".", - "action": ["python", Var("root_dir") + "/build/win/setup_cygwin_mount.py", - "--win-only"], - }, { # Download test resources, i.e. video and audio files from Google Storage. "pattern": "\\.sha1", diff --git a/talk/build/isolate.gypi b/talk/build/isolate.gypi index 3ebfbf7ba..d1ff291ef 100644 --- a/talk/build/isolate.gypi +++ b/talk/build/isolate.gypi @@ -31,6 +31,11 @@ # build/common.gypi is different for the standalone and Chromium builds. Gyp # doesn't permit conditional inclusion or variable expansion in include paths. # http://code.google.com/p/gyp/wiki/InputFormatReference#Including_Other_Files +# +# Local modifications: +# * Removed include of '../chrome/version.gypi'. +# * Removal passing of version_full variable created in version.gypi: +# '--extra-variable', 'version_full=<(version_full)', # This file is meant to be included into a target to provide a rule # to "build" .isolate files into a .isolated file. @@ -63,6 +68,9 @@ # # The generated .isolated file will be: # <(PRODUCT_DIR)/foo_test.isolated +# +# See http://dev.chromium.org/developers/testing/isolated-testing/for-swes +# for more information. { 'rules': [ @@ -73,7 +81,6 @@ # Files that are known to be involved in this step. '<(DEPTH)/tools/swarming_client/isolate.py', '<(DEPTH)/tools/swarming_client/run_isolated.py', - '<(DEPTH)/tools/swarming_client/googletest/run_test_cases.py', # Disable file tracking by the build driver for now. This means the # project must have the proper build-time dependency for their runtime @@ -90,47 +97,50 @@ 'outputs': [ '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).isolated', ], + 'action': [ + 'python', + '<(DEPTH)/tools/swarming_client/isolate.py', + '<(test_isolation_mode)', + '--result', '<@(_outputs)', + '--isolate', '<(RULE_INPUT_PATH)', + + # Variables should use the -V FOO=<(FOO) form so frequent values, + # like '0' or '1', aren't stripped out by GYP. Run 'isolate.py help' for + # more details. + # + # This list needs to be kept in sync with the cmd line options + # in src/build/android/pylib/gtest/setup.py. + + # Path variables are used to replace file paths when loading a .isolate + # file + '--path-variable', 'PRODUCT_DIR', '<(PRODUCT_DIR) ', + + '--config-variable', 'OS=<(OS)', + '--config-variable', 'chromeos=<(chromeos)', + '--config-variable', 'component=<(component)', + # TODO(kbr): move this to chrome_tests.gypi:gles2_conform_tests_run + # once support for user-defined config variables is added. + '--config-variable', + 'internal_gles2_conform_tests=<(internal_gles2_conform_tests)', + '--config-variable', 'icu_use_data_file_flag=<(icu_use_data_file_flag)', + '--config-variable', 'use_openssl=<(use_openssl)', + ], 'conditions': [ - ["test_isolation_outdir==''", { + # Note: When gyp merges lists, it appends them to the old value. + ['OS=="mac"', { + # <(mac_product_name) can contain a space, so don't use FOO=<(FOO) + # form. 'action': [ - 'python', - '<(DEPTH)/tools/swarming_client/isolate.py', - '<(test_isolation_mode)', - # GYP will eliminate duplicate arguments so '<(PRODUCT_DIR)' cannot - # be provided twice. To work around this behavior, append '/'. - # - # Also have a space after <(PRODUCT_DIR) or visual studio will - # escape the argument wrappping " with the \ and merge it into - # the following arguments. - # - # Other variables should use the -V FOO=<(FOO) form so frequent - # values, like '0' or '1', aren't stripped out by GYP. - '--outdir', '<(PRODUCT_DIR)/ ', - '--path-variable', 'PRODUCT_DIR', '<(PRODUCT_DIR) ', - '--config-variable', 'OS=<(OS)', - '--result', '<@(_outputs)', - '--isolate', '<(RULE_INPUT_PATH)', - ], - }, { - 'action': [ - 'python', - '<(DEPTH)/tools/swarming_client/isolate.py', - '<(test_isolation_mode)', - '--outdir', '<(test_isolation_outdir)', - # See comment above. - '--path-variable', 'PRODUCT_DIR', '<(PRODUCT_DIR) ', - '--config-variable', 'OS=<(OS)', - '--result', '<@(_outputs)', - '--isolate', '<(RULE_INPUT_PATH)', + '--extra-variable', 'mac_product_name', '<(mac_product_name)', ], }], + ["test_isolation_outdir!=''", { + 'action': [ '--isolate-server', '<(test_isolation_outdir)' ], + }], ['test_isolation_fail_on_missing == 0', { - 'action': ['--ignore_broken_items'], - }, - ], + 'action': ['--ignore_broken_items'], + }], ], - - 'msvs_cygwin_shell': 0, }, ], } diff --git a/webrtc/build/find_depot_tools.py b/webrtc/build/find_depot_tools.py new file mode 100644 index 000000000..cfea09b70 --- /dev/null +++ b/webrtc/build/find_depot_tools.py @@ -0,0 +1,14 @@ +#!/usr/bin/env python +# +# Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. +# +# Use of this source code is governed by a BSD-style license +# that can be found in the LICENSE file in the root of the source +# tree. An additional intellectual property rights grant can be found +# in the file PATENTS. All contributing project authors may +# be found in the AUTHORS file in the root of the source tree. + +# This empty Python module is needed to avoid an error when importing +# gyp_chromium in gyp_webrtc. The reason we're doing that is to avoid code +# duplication. We don't use the functions that actually use the find_depot_tools +# module. It was introduced as a dependency in http://crrev.com/245412. diff --git a/webrtc/build/isolate.gypi b/webrtc/build/isolate.gypi index a72026d94..3387c3674 100644 --- a/webrtc/build/isolate.gypi +++ b/webrtc/build/isolate.gypi @@ -12,6 +12,11 @@ # build/common.gypi is different for the standalone and Chromium builds. Gyp # doesn't permit conditional inclusion or variable expansion in include paths. # http://code.google.com/p/gyp/wiki/InputFormatReference#Including_Other_Files +# +# Local modifications: +# * Removed include of '../chrome/version.gypi'. +# * Removal passing of version_full variable created in version.gypi: +# '--extra-variable', 'version_full=<(version_full)', # This file is meant to be included into a target to provide a rule # to "build" .isolate files into a .isolated file. @@ -44,6 +49,9 @@ # # The generated .isolated file will be: # <(PRODUCT_DIR)/foo_test.isolated +# +# See http://dev.chromium.org/developers/testing/isolated-testing/for-swes +# for more information. { 'rules': [ @@ -54,7 +62,6 @@ # Files that are known to be involved in this step. '<(DEPTH)/tools/swarming_client/isolate.py', '<(DEPTH)/tools/swarming_client/run_isolated.py', - '<(DEPTH)/tools/swarming_client/googletest/run_test_cases.py', # Disable file tracking by the build driver for now. This means the # project must have the proper build-time dependency for their runtime @@ -71,47 +78,50 @@ 'outputs': [ '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).isolated', ], + 'action': [ + 'python', + '<(DEPTH)/tools/swarming_client/isolate.py', + '<(test_isolation_mode)', + '--result', '<@(_outputs)', + '--isolate', '<(RULE_INPUT_PATH)', + + # Variables should use the -V FOO=<(FOO) form so frequent values, + # like '0' or '1', aren't stripped out by GYP. Run 'isolate.py help' for + # more details. + # + # This list needs to be kept in sync with the cmd line options + # in src/build/android/pylib/gtest/setup.py. + + # Path variables are used to replace file paths when loading a .isolate + # file + '--path-variable', 'PRODUCT_DIR', '<(PRODUCT_DIR) ', + + '--config-variable', 'OS=<(OS)', + '--config-variable', 'chromeos=<(chromeos)', + '--config-variable', 'component=<(component)', + # TODO(kbr): move this to chrome_tests.gypi:gles2_conform_tests_run + # once support for user-defined config variables is added. + '--config-variable', + 'internal_gles2_conform_tests=<(internal_gles2_conform_tests)', + '--config-variable', 'icu_use_data_file_flag=<(icu_use_data_file_flag)', + '--config-variable', 'use_openssl=<(use_openssl)', + ], 'conditions': [ - ["test_isolation_outdir==''", { + # Note: When gyp merges lists, it appends them to the old value. + ['OS=="mac"', { + # <(mac_product_name) can contain a space, so don't use FOO=<(FOO) + # form. 'action': [ - 'python', - '<(DEPTH)/tools/swarming_client/isolate.py', - '<(test_isolation_mode)', - # GYP will eliminate duplicate arguments so '<(PRODUCT_DIR)' cannot - # be provided twice. To work around this behavior, append '/'. - # - # Also have a space after <(PRODUCT_DIR) or visual studio will - # escape the argument wrappping " with the \ and merge it into - # the following arguments. - # - # Other variables should use the -V FOO=<(FOO) form so frequent - # values, like '0' or '1', aren't stripped out by GYP. - '--outdir', '<(PRODUCT_DIR)/ ', - '--path-variable', 'PRODUCT_DIR', '<(PRODUCT_DIR) ', - '--config-variable', 'OS=<(OS)', - '--result', '<@(_outputs)', - '--isolate', '<(RULE_INPUT_PATH)', - ], - }, { - 'action': [ - 'python', - '<(DEPTH)/tools/swarming_client/isolate.py', - '<(test_isolation_mode)', - '--outdir', '<(test_isolation_outdir)', - # See comment above. - '--path-variable', 'PRODUCT_DIR', '<(PRODUCT_DIR) ', - '--config-variable', 'OS=<(OS)', - '--result', '<@(_outputs)', - '--isolate', '<(RULE_INPUT_PATH)', + '--extra-variable', 'mac_product_name', '<(mac_product_name)', ], }], + ["test_isolation_outdir!=''", { + 'action': [ '--isolate-server', '<(test_isolation_outdir)' ], + }], ['test_isolation_fail_on_missing == 0', { - 'action': ['--ignore_broken_items'], - }, - ], + 'action': ['--ignore_broken_items'], + }], ], - - 'msvs_cygwin_shell': 0, }, ], } diff --git a/webrtc/build/protoc.gypi b/webrtc/build/protoc.gypi index a996c5c40..5e486f16c 100644 --- a/webrtc/build/protoc.gypi +++ b/webrtc/build/protoc.gypi @@ -105,7 +105,6 @@ '--cpp_out', '<(cc_generator_options)<(cc_dir)', '--python_out', '<(py_dir)', ], - 'msvs_cygwin_shell': 0, 'message': 'Generating C++ and Python code from <(RULE_INPUT_PATH)', 'process_outputs_as_sources': 1, },