| Index: build/android/gyp/create_device_library_links.py
 | 
| diff --git a/build/android/gyp/create_device_library_links.py b/build/android/gyp/create_device_library_links.py
 | 
| index 8c155a01f9ea27f2ef097f8201925f11a6b8b423..6b0b24d75a671df727a797a08691d798c0f2298a 100755
 | 
| --- a/build/android/gyp/create_device_library_links.py
 | 
| +++ b/build/android/gyp/create_device_library_links.py
 | 
| @@ -18,9 +18,11 @@ import sys
 | 
|  from util import build_device
 | 
|  from util import build_utils
 | 
|  
 | 
| -BUILD_ANDROID_DIR = os.path.join(os.path.dirname(__file__), '..')
 | 
| +BUILD_ANDROID_DIR = os.path.abspath(
 | 
| +    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
 | 
|  
 | 
| @@ -96,6 +98,8 @@ def main(args):
 | 
|        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',
 | 
| @@ -103,6 +107,9 @@ def main(args):
 | 
|    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)
 | 
|  
 | 
| 
 |