Improve DEPS compatibility with planned gclient changes

BUG=570091, 748486
[email protected]

Review-Url: https://codereview.chromium.org/2989783002 .

Author: whesse

DEPS

@@ -20,7 +20,7 @@ vars = {
   # named like:
   #   external/github.com/dart-lang/NAME
   "github_mirror":
-      "https://chromium.googlesource.com/external/github.com/dart-lang/%s.git",
+      "https://chromium.googlesource.com/external/github.com/dart-lang/",
 
   # Chromium git
   "chromium_git": "https://chromium.googlesource.com",
@@ -32,7 +32,6 @@ vars = {
   # on github and add the label 'area-infrastructure'.
   # "github_dartlang": "https://github.com/dart-lang/%s.git",
 
-  "gyp_rev": "@6ee91ad8659871916f9aa840d42e1513befdf638",
   "co19_rev": "@dec2b67aaab3bb7339b9764049707e71e601da3d",
 
   # Revisions of GN related dependencies. This should match the revision
@@ -140,10 +139,6 @@ vars = {
 }
 
 deps = {
-  # Stuff needed for GYP to run.
-  Var("dart_root") + "/third_party/gyp":
-      Var('chromium_git') + '/external/gyp.git' + Var("gyp_rev"),
-
   # Stuff needed for GN build.
   Var("dart_root") + "/buildtools":
      Var("fuchsia_git") + "/buildtools" + Var("buildtools_revision"),
@@ -152,20 +147,20 @@ deps = {
     Var("clang_format_scripts_rev"),
 
   Var("dart_root") + "/tests/co19/src":
-      (Var("github_mirror") % "co19") + Var("co19_rev"),
+      Var("github_mirror") + "co19.git" + Var("co19_rev"),
 
   Var("dart_root") + "/third_party/zlib":
       Var("chromium_git") + "/chromium/src/third_party/zlib.git" +
       Var("zlib_rev"),
 
   Var("dart_root") + "/third_party/boringssl":
-      (Var("github_mirror") % "boringssl_gen") + Var("boringssl_gen_rev"),
+      Var("github_mirror") + "boringssl_gen.git" + Var("boringssl_gen_rev"),
   Var("dart_root") + "/third_party/boringssl/src":
       "https://boringssl.googlesource.com/boringssl.git" +
       Var("boringssl_rev"),
 
   Var("dart_root") + "/third_party/root_certificates":
-      (Var("github_mirror") % "root_certificates") +
+      Var("github_mirror") + "root_certificates.git" +
       Var("root_certificates_rev"),
 
   Var("dart_root") + "/third_party/jinja2":
@@ -188,152 +183,152 @@ deps = {
       Var("gperftools_revision"),
 
   Var("dart_root") + "/third_party/pkg/args":
-      (Var("github_mirror") % "args") + Var("args_tag"),
+      Var("github_mirror") + "args.git" + Var("args_tag"),
   Var("dart_root") + "/third_party/pkg/async":
-      (Var("github_mirror") % "async") + Var("async_tag"),
+      Var("github_mirror") + "async.git" + Var("async_tag"),
   Var("dart_root") + "/third_party/pkg/barback":
-      (Var("github_mirror") % "barback") + Var("barback_tag"),
+      Var("github_mirror") + "barback.git" + Var("barback_tag"),
   Var("dart_root") + "/third_party/pkg/bazel_worker":
-      (Var("github_mirror") % "bazel_worker") + Var("bazel_worker_tag"),
+      Var("github_mirror") + "bazel_worker.git" + Var("bazel_worker_tag"),
   Var("dart_root") + "/third_party/pkg/boolean_selector":
-      (Var("github_mirror") % "boolean_selector") +
+      Var("github_mirror") + "boolean_selector.git" +
       Var("boolean_selector_tag"),
   Var("dart_root") + "/third_party/pkg/charcode":
-      (Var("github_mirror") % "charcode") + Var("charcode_tag"),
+      Var("github_mirror") + "charcode.git" + Var("charcode_tag"),
   Var("dart_root") + "/third_party/pkg/cli_util":
-      (Var("github_mirror") % "cli_util") + Var("cli_util_tag"),
+      Var("github_mirror") + "cli_util.git" + Var("cli_util_tag"),
   Var("dart_root") + "/third_party/pkg/collection":
-      (Var("github_mirror") % "collection") + Var("collection_tag"),
+      Var("github_mirror") + "collection.git" + Var("collection_tag"),
   Var("dart_root") + "/third_party/pkg/convert":
-      (Var("github_mirror") % "convert") + Var("convert_tag"),
+      Var("github_mirror") + "convert.git" + Var("convert_tag"),
   Var("dart_root") + "/third_party/pkg/crypto":
-      (Var("github_mirror") % "crypto") + Var("crypto_tag"),
+      Var("github_mirror") + "crypto.git" + Var("crypto_tag"),
   Var("dart_root") + "/third_party/pkg/csslib":
-      (Var("github_mirror") % "csslib") + Var("csslib_tag"),
+      Var("github_mirror") + "csslib.git" + Var("csslib_tag"),
   Var("dart_root") + "/third_party/pkg_tested/dart_style":
-      (Var("github_mirror") % "dart_style") + Var("dart_style_tag"),
+      Var("github_mirror") + "dart_style.git" + Var("dart_style_tag"),
   Var("dart_root") + "/third_party/pkg/dart2js_info":
-      (Var("github_mirror") % "dart2js_info") + Var("dart2js_info_tag"),
+      Var("github_mirror") + "dart2js_info.git" + Var("dart2js_info_tag"),
   Var("dart_root") + "/third_party/pkg/dartdoc":
-      (Var("github_mirror") % "dartdoc") + Var("dartdoc_tag"),
+      Var("github_mirror") + "dartdoc.git" + Var("dartdoc_tag"),
   Var("dart_root") + "/third_party/pkg/fixnum":
-      (Var("github_mirror") % "fixnum") + Var("fixnum_tag"),
+      Var("github_mirror") + "fixnum.git" + Var("fixnum_tag"),
   Var("dart_root") + "/third_party/pkg/func":
-      (Var("github_mirror") % "func") + Var("func_tag"),
+      Var("github_mirror") + "func.git" + Var("func_tag"),
   Var("dart_root") + "/third_party/pkg/glob":
-      (Var("github_mirror") % "glob") + Var("glob_tag"),
+      Var("github_mirror") + "glob.git" + Var("glob_tag"),
   Var("dart_root") + "/third_party/pkg/html":
-      (Var("github_mirror") % "html") + Var("html_tag"),
+      Var("github_mirror") + "html.git" + Var("html_tag"),
   Var("dart_root") + "/third_party/pkg/http":
-      (Var("github_mirror") % "http") + Var("http_tag"),
+      Var("github_mirror") + "http.git" + Var("http_tag"),
   Var("dart_root") + "/third_party/pkg/http_multi_server":
-      (Var("github_mirror") % "http_multi_server") +
+      Var("github_mirror") + "http_multi_server.git" +
       Var("http_multi_server_tag"),
   Var("dart_root") + "/third_party/pkg/http_parser":
-      (Var("github_mirror") % "http_parser") + Var("http_parser_tag"),
+      Var("github_mirror") + "http_parser.git" + Var("http_parser_tag"),
   Var("dart_root") + "/third_party/pkg/http_throttle":
-      (Var("github_mirror") % "http_throttle") +
+      Var("github_mirror") + "http_throttle.git" +
       Var("http_throttle_tag"),
   Var("dart_root") + "/third_party/pkg/intl":
-      (Var("github_mirror") % "intl") + Var("intl_tag"),
+      Var("github_mirror") + "intl.git" + Var("intl_tag"),
   Var("dart_root") + "/third_party/pkg/isolate":
-      (Var("github_mirror") % "isolate") + Var("isolate_tag"),
+      Var("github_mirror") + "isolate.git" + Var("isolate_tag"),
   Var("dart_root") + "/third_party/pkg/json_rpc_2":
-      (Var("github_mirror") % "json_rpc_2") + Var("json_rpc_2_tag"),
+      Var("github_mirror") + "json_rpc_2.git" + Var("json_rpc_2_tag"),
   Var("dart_root") + "/third_party/pkg/linter":
-      (Var("github_mirror") % "linter") + Var("linter_tag"),
+      Var("github_mirror") + "linter.git" + Var("linter_tag"),
   Var("dart_root") + "/third_party/pkg/logging":
-      (Var("github_mirror") % "logging") + Var("logging_tag"),
+      Var("github_mirror") + "logging.git" + Var("logging_tag"),
   Var("dart_root") + "/third_party/pkg/markdown":
-      (Var("github_mirror") % "markdown") + Var("markdown_tag"),
+      Var("github_mirror") + "markdown.git" + Var("markdown_tag"),
   Var("dart_root") + "/third_party/pkg/matcher":
-      (Var("github_mirror") % "matcher") + Var("matcher_tag"),
+      Var("github_mirror") + "matcher.git" + Var("matcher_tag"),
   Var("dart_root") + "/third_party/pkg/mime":
-      (Var("github_mirror") % "mime") + Var("mime_rev"),
+      Var("github_mirror") + "mime.git" + Var("mime_rev"),
   Var("dart_root") + "/third_party/pkg/mockito":
       "https://github.com/dart-lang/mockito.git" + Var("mockito_tag"),
   Var("dart_root") + "/third_party/pkg/mustache4dart":
       Var("chromium_git")
       + "/external/github.com/valotas/mustache4dart.git"
       + Var("mustache4dart_tag"),
   Var("dart_root") + "/third_party/pkg/oauth2":
-      (Var("github_mirror") % "oauth2") + Var("oauth2_tag"),
+      Var("github_mirror") + "oauth2.git" + Var("oauth2_tag"),
   Var("dart_root") + "/third_party/observatory_pub_packages":
-      (Var("github_mirror") % "observatory_pub_packages")
+      Var("github_mirror") + "observatory_pub_packages.git"
       + Var("observatory_pub_packages_rev"),
   Var("dart_root") + "/third_party/pkg_tested/package_config":
-      (Var("github_mirror") % "package_config") +
+      Var("github_mirror") + "package_config.git" +
       Var("package_config_tag"),
   Var("dart_root") + "/third_party/pkg_tested/package_resolver":
-      (Var("github_mirror") % "package_resolver") + Var("package_resolver_tag"),
+      Var("github_mirror") + "package_resolver.git" + Var("package_resolver_tag"),
   Var("dart_root") + "/third_party/pkg/path":
-      (Var("github_mirror") % "path") + Var("path_tag"),
+      Var("github_mirror") + "path.git" + Var("path_tag"),
   Var("dart_root") + "/third_party/pkg/plugin":
-      (Var("github_mirror") % "plugin") + Var("plugin_tag"),
+      Var("github_mirror") + "plugin.git" + Var("plugin_tag"),
   Var("dart_root") + "/third_party/pkg/pool":
-      (Var("github_mirror") % "pool") + Var("pool_tag"),
+      Var("github_mirror") + "pool.git" + Var("pool_tag"),
   Var("dart_root") + "/third_party/pkg/protobuf":
-      (Var("github_mirror") % "protobuf") + Var("protobuf_tag"),
+      Var("github_mirror") + "protobuf.git" + Var("protobuf_tag"),
   Var("dart_root") + "/third_party/pkg/pub_semver":
-      (Var("github_mirror") % "pub_semver") + Var("pub_semver_tag"),
+      Var("github_mirror") + "pub_semver.git" + Var("pub_semver_tag"),
   Var("dart_root") + "/third_party/pkg/pub":
-      (Var("github_mirror") % "pub") + Var("pub_rev"),
+      Var("github_mirror") + "pub.git" + Var("pub_rev"),
   Var("dart_root") + "/third_party/pkg/quiver":
       Var("chromium_git")
       + "/external/github.com/google/quiver-dart.git"
       + Var("quiver_tag"),
   Var("dart_root") + "/third_party/pkg/resource":
-      (Var("github_mirror") % "resource") + Var("resource_rev"),
+      Var("github_mirror") + "resource.git" + Var("resource_rev"),
   Var("dart_root") + "/third_party/pkg/scheduled_test":
-      (Var("github_mirror") % "scheduled_test") + Var("scheduled_test_tag"),
+      Var("github_mirror") + "scheduled_test.git" + Var("scheduled_test_tag"),
   Var("dart_root") + "/third_party/pkg/shelf":
-      (Var("github_mirror") % "shelf") + Var("shelf_tag"),
+      Var("github_mirror") + "shelf.git" + Var("shelf_tag"),
   Var("dart_root") + "/third_party/pkg/shelf_packages_handler":
-      (Var("github_mirror") % "shelf_packages_handler")
+      Var("github_mirror") + "shelf_packages_handler.git"
       + Var("shelf_packages_handler_tag"),
   Var("dart_root") + "/third_party/pkg/shelf_static":
-      (Var("github_mirror") % "shelf_static") + Var("shelf_static_tag"),
+      Var("github_mirror") + "shelf_static.git" + Var("shelf_static_tag"),
   Var("dart_root") + "/third_party/pkg/shelf_web_socket":
-      (Var("github_mirror") % "shelf_web_socket") +
+      Var("github_mirror") + "shelf_web_socket.git" +
       Var("shelf_web_socket_tag"),
   Var("dart_root") + "/third_party/pkg/source_maps":
-      (Var("github_mirror") % "source_maps") + Var("source_maps_tag"),
+      Var("github_mirror") + "source_maps.git" + Var("source_maps_tag"),
   Var("dart_root") + "/third_party/pkg/source_span":
-      (Var("github_mirror") % "source_span") + Var("source_span_tag"),
+      Var("github_mirror") + "source_span.git" + Var("source_span_tag"),
   Var("dart_root") + "/third_party/pkg/source_map_stack_trace":
-      (Var("github_mirror") % "source_map_stack_trace") +
+      Var("github_mirror") + "source_map_stack_trace.git" +
       Var("source_map_stack_trace_tag"),
   Var("dart_root") + "/third_party/pkg/stack_trace":
-      (Var("github_mirror") % "stack_trace") + Var("stack_trace_tag"),
+      Var("github_mirror") + "stack_trace.git" + Var("stack_trace_tag"),
   Var("dart_root") + "/third_party/pkg/stream_channel":
-      (Var("github_mirror") % "stream_channel") +
+      Var("github_mirror") + "stream_channel.git" +
       Var("stream_channel_tag"),
   Var("dart_root") + "/third_party/pkg/string_scanner":
-      (Var("github_mirror") % "string_scanner") +
+      Var("github_mirror") + "string_scanner.git" +
       Var("string_scanner_tag"),
   Var("dart_root") + "/third_party/sunflower":
-      (Var("github_mirror") % "sample-sunflower") +
+      Var("github_mirror") + "sample-sunflower.git" +
       Var("sunflower_rev"),
   Var("dart_root") + "/third_party/pkg/test":
-      (Var("github_mirror") % "test") + Var("test_tag"),
+      Var("github_mirror") + "test.git" + Var("test_tag"),
   Var("dart_root") + "/third_party/pkg/test_reflective_loader":
-      (Var("github_mirror") % "test_reflective_loader") +
+      Var("github_mirror") + "test_reflective_loader.git" +
       Var("test_reflective_loader_tag"),
   Var("dart_root") + "/third_party/pkg/tuple":
-      (Var("github_mirror") % "tuple") + Var("tuple_tag"),
+      Var("github_mirror") + "tuple.git" + Var("tuple_tag"),
   Var("dart_root") + "/third_party/pkg/typed_data":
-      (Var("github_mirror") % "typed_data") + Var("typed_data_tag"),
+      Var("github_mirror") + "typed_data.git" + Var("typed_data_tag"),
   Var("dart_root") + "/third_party/pkg/usage":
-      (Var("github_mirror") % "usage") + Var("usage_tag"),
+      Var("github_mirror") + "usage.git" + Var("usage_tag"),
   Var("dart_root") + "/third_party/pkg/utf":
-      (Var("github_mirror") % "utf") + Var("utf_tag"),
+      Var("github_mirror") + "utf.git" + Var("utf_tag"),
   Var("dart_root") + "/third_party/pkg/watcher":
-      (Var("github_mirror") % "watcher") + Var("watcher_tag"),
+      Var("github_mirror") + "watcher.git" + Var("watcher_tag"),
   Var("dart_root") + "/third_party/pkg/web_socket_channel":
-      (Var("github_mirror") % "web_socket_channel") +
+      Var("github_mirror") + "web_socket_channel.git" +
       Var("web_socket_channel_tag"),
   Var("dart_root") + "/third_party/pkg/yaml":
-      (Var("github_mirror") % "yaml") + Var("yaml_tag"),
+      Var("github_mirror") + "yaml.git" + Var("yaml_tag"),
 }
 
 deps_os = {