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 'targets': [ | 5 'targets': [ |
| 6 { | 6 { |
| 7 # These libraries from the Android ndk are required to be packaged with | |
|
Yaron
2013/04/02 01:30:35
This is only true for the component build and so y
cjhopman
2013/04/02 20:47:31
Done.
| |
| 8 # any APK that is built with them. build/java_apk.gypi expects any | |
| 9 # libraries that should be packaged with the apk to be in | |
| 10 # <(SHARED_LIB_DIR) | |
| 11 'target_name': 'copy_system_libraries', | |
| 12 'type': 'none', | |
| 13 'copies': [ | |
| 14 { | |
| 15 'destination': '<(SHARED_LIB_DIR)/', | |
| 16 'files': [ | |
| 17 '<(DEPTH)/third_party/android_tools/ndk/sources/cxx-stl/stlport/libs /<(android_app_abi)/libstlport_shared.so', | |
|
Yaron
2013/04/02 01:30:35
Can you not use <(android_ndk_root) ?
Yaron
2013/04/02 01:30:35
Can you add a comment to build/common.gypi where t
cjhopman
2013/04/02 20:47:31
Done.
cjhopman
2013/04/02 20:47:31
I've refactored common.gypi so that any changes to
Yaron
2013/04/02 21:00:41
Nice
| |
| 18 '<(DEPTH)/third_party/android_tools/ndk/sources/cxx-stl/gnu-libstdc+ +/4.6/libs/<(android_app_abi)/libgnustl_shared.so', | |
| 19 ], | |
| 20 }, | |
| 21 ], | |
| 22 }, | |
| 23 { | |
| 7 # Target for creating common output build directories. Creating output | 24 # Target for creating common output build directories. Creating output |
| 8 # dirs beforehand ensures that build scripts can assume these folders to | 25 # dirs beforehand ensures that build scripts can assume these folders to |
| 9 # exist and there are no race conditions resulting from build scripts | 26 # exist and there are no race conditions resulting from build scripts |
| 10 # trying to create these directories. | 27 # trying to create these directories. |
| 11 # The build/java.gypi target depends on this target. | 28 # The build/java.gypi target depends on this target. |
| 12 'target_name': 'build_output_dirs', | 29 'target_name': 'build_output_dirs', |
| 13 'type': 'none', | 30 'type': 'none', |
| 14 'actions': [ | 31 'actions': [ |
| 15 { | 32 { |
| 16 'action_name': 'create_java_output_dirs', | 33 'action_name': 'create_java_output_dirs', |
| (...skipping 10 matching lines...) Expand all Loading... | |
| 27 # written to them). | 44 # written to them). |
| 28 'outputs': [''], | 45 'outputs': [''], |
| 29 'action': [ | 46 'action': [ |
| 30 'mkdir', | 47 'mkdir', |
| 31 '-p', | 48 '-p', |
| 32 '<@(output_dirs)', | 49 '<@(output_dirs)', |
| 33 ], | 50 ], |
| 34 }, | 51 }, |
| 35 ], | 52 ], |
| 36 }, # build_output_dirs | 53 }, # build_output_dirs |
| 37 ], # targets | 54 ] |
| 38 } | 55 } |
| 56 | |
| OLD | NEW |