| Index: build/android/write_ordered_libraries.gypi
|
| diff --git a/build/android/write_ordered_libraries.gypi b/build/android/write_ordered_libraries.gypi
|
| index e9b8ba53792905520c0ff042b14900f818db34e1..1b52e71e4231cb33503188b69a25312fef6f4486 100644
|
| --- a/build/android/write_ordered_libraries.gypi
|
| +++ b/build/android/write_ordered_libraries.gypi
|
| @@ -19,10 +19,11 @@
|
| #
|
|
|
| {
|
| - 'action_name': 'ordered_libraries_<(_target_name)',
|
| + 'action_name': 'ordered_libraries_<(_target_name)<(subtarget)',
|
| 'message': 'Writing dependency ordered libraries for <(_target_name)',
|
| 'variables': {
|
| 'input_libraries%': [],
|
| + 'subtarget%': '',
|
| },
|
| 'inputs': [
|
| '<(DEPTH)/build/android/gyp/util/build_utils.py',
|
| @@ -35,7 +36,7 @@
|
| 'action': [
|
| 'python', '<(DEPTH)/build/android/gyp/write_ordered_libraries.py',
|
| '--input-libraries=<(input_libraries)',
|
| - '--libraries-dir=<(SHARED_LIB_DIR)',
|
| + '--libraries-dir=<(SHARED_LIB_DIR),<(PRODUCT_DIR)',
|
| '--readelf=<(android_readelf)',
|
| '--output=<(ordered_libraries_file)',
|
| ],
|
|
|