[gms updater] Fixes and tests to prepare activation

build/android/play_services/utils.py

 # Copyright 2015 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.
 
 '''
 Utility functions for all things related to manipulating google play services
 related files.
 '''
 
 import argparse
 import filecmp
 import json
 import logging
 import os
 import re
 import sys
-import zipfile
 
 sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir))
 from devil.utils import cmd_helper
 
 
 _XML_VERSION_NUMBER_PATTERN = re.compile(
     r'<integer name="google_play_services_version">(\d+)<\/integer>')
 
 
 class DefaultsRawHelpFormatter(argparse.ArgumentDefaultsHelpFormatter,
@@ skipping 77 matching lines @@
 def MakeLocalCommit(repo_root, files_to_commit, message):
   '''Makes a local git commit.'''
 
   logging.debug('Staging files (%s) for commit.', files_to_commit)
   if cmd_helper.Call(['git', 'add'] + files_to_commit, cwd=repo_root) != 0:
     raise Exception('The local commit failed.')
 
   logging.debug('Committing.')
   if cmd_helper.Call(['git', 'commit', '-m', message], cwd=repo_root) != 0:
     raise Exception('The local commit failed.')
-
-
-def ZipDir(output, base_dir):
-  '''Creates a zip file from a directory.'''
-
-  base = os.path.join(base_dir, os.pardir)
-  with zipfile.ZipFile(output, 'w') as out_file:
-    for root, _, files in os.walk(base_dir):
-      for in_file in files:
-        out_file.write(os.path.join(root, in_file), base)