Update usage of Proguard in clank after moving Proguard to third_party.

build/android/pylib/instrumentation/test_jar.py

 # Copyright (c) 2013 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.
 
 """Helper class for instrumenation test jar."""
 # pylint: disable=W0702
 
 import logging
 import os
 import pickle
@@ skipping 27 matching lines @@
   _PROGUARD_METHOD_RE = re.compile(r'\s*?- Method:\s*(\S*)[(].*$')
   _PROGUARD_ANNOTATION_RE = re.compile(r'\s*?- Annotation \[L(\S*);\]:$')
   _PROGUARD_ANNOTATION_CONST_RE = (
       re.compile(r'\s*?- Constant element value.*$'))
   _PROGUARD_ANNOTATION_VALUE_RE = re.compile(r'\s*?- \S+? \[(.*)\]$')
 
   def __init__(self, jar_path):
     if not os.path.exists(jar_path):
       raise Exception('%s not found, please build it' % jar_path)
 
-    self._PROGUARD_PATH = os.path.join(constants.ANDROID_SDK_ROOT,
-                                       'tools/proguard/lib/proguard.jar')
+    self._PROGUARD_PATH = os.path.join(constants.PROGUARD_ROOT,
+                                       'lib', 'proguard.jar')
     if not os.path.exists(self._PROGUARD_PATH):
       self._PROGUARD_PATH = os.path.join(os.environ['ANDROID_BUILD_TOP'],
                                          'external/proguard/lib/proguard.jar')
     self._jar_path = jar_path
     self._pickled_proguard_name = self._jar_path + '-proguard.pickle'
     self._test_methods = {}
     if not self._GetCachedProguardData():
       self._GetProguardData()
 
   def _GetCachedProguardData(self):
@@ skipping 162 matching lines @@
     devices = device_utils.DeviceUtils.parallel(devices)
     min_sdk_version = min(devices.build_version_sdk.pGet(None))
     tests = [t for t in tests
              if self._IsTestValidForSdkRange(t, min_sdk_version)]
 
     return tests
 
   @staticmethod
   def IsHostDrivenTest(test):
     return 'pythonDrivenTests' in test