Preserve embedded DEPS files during mojo roll

mojo/tools/rev_sdk.py

 #!/usr/bin/env python
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Tool to roll Mojo into Chromium. See:
 https://github.com/domokit/mojo/wiki/Rolling-code-between-chromium-and-mojo#mojo---chromium-updates-sdk--edk
 """
 
 import os
 import sys
 from utils import commit
-from utils import mojo_root_dir
+from utils import chromium_root_dir
 from utils import system
 
 sdk_prefix_in_chromium = "third_party/mojo/src"
 sdk_dirs_to_clone = [
   "mojo/edk",
   "mojo/public",
   "nacl_bindings",
 ]
 
-
-services_prefix_in_mojo = "mojo/services"
-services_prefix_in_chromium = "third_party/mojo_services/src"
+# Individual files to preserve within the target repository during roll. These
+# are relative to |sdk_prefix_in_chromium| but are not maintained in the mojo
+# repository.
+preserved_chromium_files = [
+  "mojo/edk/DEPS",
+  "mojo/public/DEPS",
+  "mojo/public/platform/nacl/DEPS",
+  "nacl_bindings/DEPS",
+]
 
 # A dictionary mapping dirs to clone to their destination locations in Chromium.
 dirs_to_clone = {}
 
 for sdk_dir in sdk_dirs_to_clone:
   sdk_dir_in_chromium = os.path.join(sdk_prefix_in_chromium, sdk_dir)
   dirs_to_clone[sdk_dir] = sdk_dir_in_chromium
 
 def rev(source_dir, chromium_dir):
   src_commit = system(["git", "show-ref", "HEAD", "-s"], cwd=source_dir).strip()
@@ skipping 17 matching lines @@
       system(["mkdir", "-p", os.path.dirname(dest_path)])
       system(["cp", os.path.join(source_dir, f), dest_path])
     os.chdir(chromium_dir)
     system(["git", "add", dest_dir], cwd=chromium_dir)
 
   mojo_public_dest_dir = os.path.join(sdk_prefix_in_chromium, "mojo/public")
   version_filename = os.path.join(mojo_public_dest_dir, "VERSION")
   with open(version_filename, "w") as version_file:
     version_file.write(src_commit)
   system(["git", "add", version_filename], cwd=chromium_dir)
+
+  # Reset preserved files that were blown away.
+  for rel_path in preserved_chromium_files:
+    preserved_path = os.path.join(sdk_prefix_in_chromium, rel_path)
+    system(["git", "reset", "--", preserved_path])
+    system(["git", "checkout", preserved_path])
+
   commit("Update mojo sdk to rev " + src_commit, cwd=chromium_dir)
 
 if len(sys.argv) != 2:
-  print "usage: rev_sdk.py <chromium source dir>"
+  print "usage: rev_sdk.py <mojo source dir>"
   sys.exit(1)
 
-rev(mojo_root_dir, sys.argv[1])
+rev(sys.argv[1], chromium_root_dir)