Revert 221736 "[android] Adds constants.GetOutDirectory() and co..."

trunk/src/build/android/adb_install_apk.py

Index: trunk/src/build/android/adb_install_apk.py
===================================================================
--- trunk/src/build/android/adb_install_apk.py	(revision 222006)
+++ trunk/src/build/android/adb_install_apk.py	(working copy)
@@ -38,8 +38,9 @@
   if not options.apk:
     option_parser.error('--apk is mandatory.')
   if not os.path.exists(options.apk):
-    options.apk = os.path.join(constants.GetOutDirectory(), 'apks',
-                               options.apk)
+    options.apk = os.path.join(constants.DIR_SOURCE_ROOT,
+                               'out', options.build_type,
+                               'apks', options.apk)
 
 
 def _InstallApk(args):
@@ -53,7 +54,6 @@
   parser = optparse.OptionParser()
   AddInstallAPKOption(parser)
   options, args = parser.parse_args(argv)
-  constants.SetBuildType(options.build_type)
   ValidateInstallAPKOption(parser, options)
   if len(args) > 1:
     raise Exception('Error: Unknown argument:', args[1:])