[Android] Prepare build/android/ for catapult+devil.

build/android/gyp/push_libraries.py

Index: build/android/gyp/push_libraries.py
diff --git a/build/android/gyp/push_libraries.py b/build/android/gyp/push_libraries.py
index e1a01d7d79151c3f7dce26a7e21088ed21e715d9..3dae6f0d71f092dcee35c94dc20aaf5a6b1e079e 100755
--- a/build/android/gyp/push_libraries.py
+++ b/build/android/gyp/push_libraries.py
@@ -12,16 +12,17 @@ import optparse
 import os
 import sys
 
+from util import build_device
+from util import build_utils
+from util import md5_check
+
 BUILD_ANDROID_DIR = os.path.abspath(
     os.path.join(os.path.dirname(__file__), os.pardir))
 sys.path.append(BUILD_ANDROID_DIR)
 
+import devil_chromium
 from pylib import constants
 
-from util import build_device
-from util import build_utils
-from util import md5_check
-
 def DoPush(options):
   libraries = build_utils.ParseGypList(options.libraries)
 
@@ -63,13 +64,15 @@ def main(args):
   parser.add_option('--stamp', help='Path to touch on success.')
   parser.add_option('--build-device-configuration',
       help='Path to build device configuration.')
-  parser.add_option('--configuration-name',
-      help='The build CONFIGURATION_NAME')
+  parser.add_option('--output-directory',

[agrieve, 2016/01/08 21:04:03]

Need to update java_apk.gypi to not pass --configuration-name?

[jbudorick, 2016/01/08 23:10:21]

No, the update to push_libraries.gypi in this CL does that.
https://code.google.com/p/chromium/codesearch#chromium/src/build/java_apk.gyp...
is for create_device_library_links.

+      help='The output directory.')
   options, _ = parser.parse_args(args)
 
   required_options = ['libraries', 'device_dir', 'libraries']
   build_utils.CheckOptions(options, parser, required=required_options)
-  constants.SetBuildType(options.configuration_name)
+
+  devil_chromium.Initialize(
+      output_directory=os.path.abspath(options.output_directory))
 
   DoPush(options)