| OLD | NEW | 
|---|
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be | 
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. | 
| 4 { | 4 { | 
| 5   'conditions': [ | 5   'conditions': [ | 
| 6     ['android_must_copy_system_libraries == 1', { | 6     ['android_must_copy_system_libraries == 1', { | 
| 7       'targets': [ | 7       'targets': [ | 
| 8         { | 8         { | 
| 9           # These libraries from the Android ndk are required to be packaged wit
     h | 9           # These libraries from the Android ndk are required to be packaged wit
     h | 
| 10           # any APK that is built with them. build/java_apk.gypi expects any | 10           # any APK that is built with them. build/java_apk.gypi expects any | 
| (...skipping 30 matching lines...) Expand all  Loading... | 
| 41           ], | 41           ], | 
| 42           'action': [ | 42           'action': [ | 
| 43             'python', 'gyp/get_device_configuration.py', | 43             'python', 'gyp/get_device_configuration.py', | 
| 44             '--output=<(build_device_config_path)', | 44             '--output=<(build_device_config_path)', | 
| 45             '--output-directory=<(PRODUCT_DIR)', | 45             '--output-directory=<(PRODUCT_DIR)', | 
| 46           ], | 46           ], | 
| 47         } | 47         } | 
| 48       ], | 48       ], | 
| 49     }, | 49     }, | 
| 50     { | 50     { | 
|  | 51       # We cannot use the jinja gypi file because we need to do operations with | 
|  | 52       # the PRODUCT_DIR variable before passing it to the jinja template. | 
|  | 53       # This variable is not known at GYP time so we have to pass it to a | 
|  | 54       # wrapper script to do the operations. | 
|  | 55       'target_name': 'devil_chromium_config', | 
|  | 56       'type': 'none', | 
|  | 57       'actions': [ | 
|  | 58         { | 
|  | 59           'action_name': 'devil_chromium_config__jinja_template', | 
|  | 60           'message': 'processing jinja template', | 
|  | 61           'variables': { | 
|  | 62             'output_file_name': 'devil_chromium.json', | 
|  | 63           }, | 
|  | 64           'action': [ | 
|  | 65             'python', '<(DEPTH)/build/android/gyp_devil_jinja_processor.py', | 
|  | 66             '--android-abi', '<(android_app_abi)', | 
|  | 67             '--android-sdk-root', '<(android_sdk_root)', | 
|  | 68             '--build-tools-version', '<(android_sdk_build_tools_version)', | 
|  | 69             '--input-file-path', '<(DEPTH)/build/android/devil_chromium.jinja', | 
|  | 70             '--output-file-name', '<(output_file_name)', | 
|  | 71             '--product-dir', '<(PRODUCT_DIR)', | 
|  | 72           ], | 
|  | 73           'inputs': [ | 
|  | 74             '<(DEPTH)/build/android/gyp_devil_jinja_processor.py', | 
|  | 75             '<(DEPTH)/build/android/gyp/jinja_template.py', | 
|  | 76           ], | 
|  | 77           'outputs': [ | 
|  | 78             '<(PRODUCT_DIR)/gen/<(output_file_name)', | 
|  | 79           ] | 
|  | 80         }, | 
|  | 81       ], | 
|  | 82     }, # devil_chromium_config | 
|  | 83     { | 
| 51       # Target for creating common output build directories. Creating output | 84       # Target for creating common output build directories. Creating output | 
| 52       # dirs beforehand ensures that build scripts can assume these folders to | 85       # dirs beforehand ensures that build scripts can assume these folders to | 
| 53       # exist and there are no race conditions resulting from build scripts | 86       # exist and there are no race conditions resulting from build scripts | 
| 54       # trying to create these directories. | 87       # trying to create these directories. | 
| 55       # The build/java.gypi target depends on this target. | 88       # The build/java.gypi target depends on this target. | 
| 56       'target_name': 'build_output_dirs', | 89       'target_name': 'build_output_dirs', | 
| 57       'type': 'none', | 90       'type': 'none', | 
| 58       'actions': [ | 91       'actions': [ | 
| 59         { | 92         { | 
| 60           'action_name': 'create_java_output_dirs', | 93           'action_name': 'create_java_output_dirs', | 
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 103           'action': [ | 136           'action': [ | 
| 104             'python', 'gyp/find_sun_tools_jar.py', | 137             'python', 'gyp/find_sun_tools_jar.py', | 
| 105             '--output', '<(found_jar_path)', | 138             '--output', '<(found_jar_path)', | 
| 106           ], | 139           ], | 
| 107         }, | 140         }, | 
| 108       ], | 141       ], | 
| 109     }, # sun_tools_java | 142     }, # sun_tools_java | 
| 110   ] | 143   ] | 
| 111 } | 144 } | 
| 112 | 145 | 
| OLD | NEW | 
|---|