Chromium Code Reviews| 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 ['component == "shared_library"', { | 6 ['component == "shared_library"', { |
| 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 |
| 11 # libraries that should be packaged with the apk to be in | 11 # libraries that should be packaged with the apk to be in |
| 12 # <(SHARED_LIB_DIR) | 12 # <(SHARED_LIB_DIR) |
| 13 'target_name': 'copy_system_libraries', | 13 'target_name': 'copy_system_libraries', |
| 14 'type': 'none', | 14 'type': 'none', |
| 15 'copies': [ | 15 'copies': [ |
| 16 { | 16 { |
| 17 'destination': '<(SHARED_LIB_DIR)/', | 17 'destination': '<(SHARED_LIB_DIR)/', |
| 18 'files': [ | 18 'files': [ |
| 19 '<(android_libcpp_libs_dir)/libc++_shared.so', | 19 '<(android_stlport_libs_dir)/libstlport_shared.so', |
|
jbudorick
2015/05/07 18:49:27
Oh, you haven't rebased in a while. Do so before y
raywilliams_chromium
2015/05/11 19:52:25
Done.
raywilliams_chromium
2015/05/11 19:52:25
Yeah, that caused some false changes in this revie
| |
| 20 ], | 20 ], |
| 21 }, | 21 }, |
| 22 ], | 22 ], |
| 23 }, | 23 }, |
| 24 ], | 24 ], |
| 25 }], | 25 }], |
| 26 ], | 26 ], |
| 27 'targets': [ | 27 'targets': [ |
| 28 { | 28 { |
| 29 'target_name': 'get_build_device_configurations', | 29 'target_name': 'get_build_device_configurations', |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 70 # written to them). | 70 # written to them). |
| 71 'outputs': [''], | 71 'outputs': [''], |
| 72 'action': [ | 72 'action': [ |
| 73 'mkdir', | 73 'mkdir', |
| 74 '-p', | 74 '-p', |
| 75 '<@(output_dirs)', | 75 '<@(output_dirs)', |
| 76 ], | 76 ], |
| 77 }, | 77 }, |
| 78 ], | 78 ], |
| 79 }, # build_output_dirs | 79 }, # build_output_dirs |
| 80 { | |
| 81 'target_name': 'sun_tools_java', | |
| 82 'type': 'none', | |
| 83 'variables': { | |
| 84 'found_jar_path': '<(PRODUCT_DIR)/sun_tools_java/tools.jar', | |
| 85 'jar_path': '<(found_jar_path)', | |
| 86 }, | |
| 87 'includes': [ | |
| 88 '../../build/host_prebuilt_jar.gypi', | |
| 89 ], | |
| 90 'actions': [ | |
| 91 { | |
| 92 'action_name': 'find_sun_tools_jar', | |
| 93 'variables' : { | |
| 94 }, | |
| 95 'inputs' : [ | |
| 96 'gyp/find_sun_tools_jar.py', | |
| 97 'gyp/util/build_utils.py', | |
| 98 ], | |
| 99 'outputs': [ | |
| 100 '<(found_jar_path)', | |
| 101 ], | |
| 102 'action': [ | |
| 103 'python', 'gyp/find_sun_tools_jar.py', | |
| 104 '--output', '<(found_jar_path)', | |
| 105 ], | |
| 106 }, | |
| 107 ], | |
| 108 }, # sun_tools_java | |
| 80 ] | 109 ] |
| 81 } | 110 } |
| 82 | |
| OLD | NEW |