| Index: build/android/gyp/write_ordered_libraries.py
|
| diff --git a/build/android/gyp/write_ordered_libraries.py b/build/android/gyp/write_ordered_libraries.py
|
| index f656adfe30aca472a6ea6ee1f96c4032e17dbc78..4765878142c6901425c06bd9d7547b0c88f11e30 100755
|
| --- a/build/android/gyp/write_ordered_libraries.py
|
| +++ b/build/android/gyp/write_ordered_libraries.py
|
| @@ -102,6 +102,8 @@ def main():
|
| help='A list of top-level input libraries.')
|
| parser.add_option('--libraries-dir',
|
| help='The directory which contains shared libraries.')
|
| + parser.add_option('--unpackaged-libraries',
|
| + help='List of additional libraries to load that are not in the APK.')
|
| parser.add_option('--readelf', help='Path to the readelf binary.')
|
| parser.add_option('--output', help='Path to the generated .json file.')
|
| parser.add_option('--stamp', help='Path to touch on success.')
|
| @@ -114,10 +116,15 @@ def main():
|
| libraries = build_utils.ParseGnList(options.input_libraries)
|
| if len(libraries):
|
| libraries = GetSortedTransitiveDependenciesForBinaries(libraries)
|
| + if options.unpackaged_libraries:
|
| + unpackaged_libraries = build_utils.ParseGnList(options.unpackaged_libraries)
|
| + else:
|
| + unpackaged_libraries = []
|
|
|
| # Convert to "base" library names: e.g. libfoo.so -> foo
|
| + all_libraries = libraries + unpackaged_libraries
|
| java_libraries_list = (
|
| - '{%s}' % ','.join(['"%s"' % s[3:-3] for s in libraries]))
|
| + '{%s}' % ','.join(['"%s"' % s[3:-3] for s in all_libraries]))
|
|
|
| out_json = {
|
| 'libraries': libraries,
|
|
|