From 6748b8c503137046c2b78c67bab3b895db3c94f3 Mon Sep 17 00:00:00 2001
From: feng <feng@chromium.org>
Date: Wed, 26 Nov 2014 16:27:25 -0800
Subject: [PATCH] [Android] Remove the workaround code of a platform bug.

From our UMA and operation feedbacks, we don't see such issue anymore.
(We notified the manufactor of the issue and likely they addressed it
in OTA). The cleanup restores native library name to libchrome.so
instead of libchrome.<VER>.so.

BUG=311644

Review URL: https://codereview.chromium.org/759833002

Cr-Original-Commit-Position: refs/heads/master@{#305925}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: d9201758ca9e6dc47e36026a4029dae5cc69e4c4
---
 android/gyp/delete_files.py | 53 -------------------------------------
 util/version.gypi           |  2 --
 2 files changed, 55 deletions(-)
 delete mode 100755 android/gyp/delete_files.py

diff --git a/android/gyp/delete_files.py b/android/gyp/delete_files.py
deleted file mode 100755
index 2fd945c0c..000000000
--- a/android/gyp/delete_files.py
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/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.
-
-"""Delete files in directories matching a pattern.
-"""
-
-import glob
-import optparse
-import os
-import sys
-
-from util import build_utils
-
-def main():
-  parser = optparse.OptionParser()
-  parser.add_option(
-      '--pattern',
-      help='Pattern for matching Files to delete.')
-  parser.add_option(
-      '--keep',
-      help='Files to keep even if they matches the pattern.')
-  parser.add_option(
-      '--stamp',
-      help='Path to touch on success')
-
-  options, args = parser.parse_args()
-
-  if not options.pattern or not args:
-    print 'No --pattern or target directories given'
-    return
-
-  for target_dir in args:
-    target_pattern = os.path.join(target_dir, options.pattern)
-    matching_files = glob.glob(target_pattern)
-
-    keep_pattern = os.path.join(target_dir, options.keep)
-    files_to_keep = glob.glob(keep_pattern)
-
-    for target_file in matching_files:
-      if target_file in files_to_keep:
-        continue
-
-      if os.path.isfile(target_file):
-        os.remove(target_file)
-
-  if options.stamp:
-    build_utils.Touch(options.stamp)
-
-if __name__ == '__main__':
-  sys.exit(main())
-
diff --git a/util/version.gypi b/util/version.gypi
index b05b415db..327a5c2e5 100644
--- a/util/version.gypi
+++ b/util/version.gypi
@@ -14,8 +14,6 @@
     'lastchange_path': '<(lastchange_path)',
     'version_full':
         '<!(python <(version_py_path) -f <(version_path) -t "@MAJOR@.@MINOR@.@BUILD@.@PATCH@")',
-    'version_libchrome_short':
-        '<!(python <(version_py_path) -f <(version_path) -t "@BUILD@.@PATCH@")',
     'version_mac_dylib':
         '<!(python <(version_py_path) -f <(version_path) -t "@BUILD@.@PATCH_HI@.@PATCH_LO@" -e "PATCH_HI=int(PATCH)/256" -e "PATCH_LO=int(PATCH)%256")',
   },  # variables