Revert of [Android] Add a configurable environment for devil/. (RELAND)

build/android/gyp/create_device_library_links.py

 #!/usr/bin/env python
 #
 # Copyright 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.
 
 """Creates symlinks to native libraries for an APK.
 
 The native libraries should have previously been pushed to the device (in
 options.target_dir). This script then creates links in an apk's lib/ folder to
 those native libraries.
 """
 
 import optparse
 import os
 import sys
 
 from util import build_device
 from util import build_utils
 
-BUILD_ANDROID_DIR = os.path.abspath(
-    os.path.join(os.path.dirname(__file__), '..'))
+BUILD_ANDROID_DIR = os.path.join(os.path.dirname(__file__), '..')
 sys.path.append(BUILD_ANDROID_DIR)
 
-import devil_chromium
 from devil.android import apk_helper
 from pylib import constants
 
 def RunShellCommand(device, cmd):
   output = device.RunShellCommand(cmd)
 
   if output:
     raise Exception(
         'Unexpected output running command: ' + cmd + '\n' +
         '\n'.join(output))
@@ skipping 55 matching lines @@
       help='Path on the device to push the created symlink script.')
   parser.add_option('--libraries',
       help='List of native libraries.')
   parser.add_option('--target-dir',
       help='Device directory that contains the target libraries for symlinks.')
   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',
-      help='The output directory')
   options, _ = parser.parse_args(args)
 
   required_options = ['apk', 'libraries', 'script_host_path',
       'script_device_path', 'target_dir', 'configuration_name']
   build_utils.CheckOptions(options, parser, required=required_options)
   constants.SetBuildType(options.configuration_name)
 
-  devil_chromium.Initialize(
-      output_directory=os.path.abspath(options.output_directory))
-
   CreateSymlinkScript(options)
   TriggerSymlinkScript(options)
 
   if options.stamp:
     build_utils.Touch(options.stamp)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))