| Index: build/android/gyp/write_build_config.py
|
| diff --git a/build/android/gyp/write_build_config.py b/build/android/gyp/write_build_config.py
|
| index 7340b378e1d7d953c1e8205031b54a7a35038b52..0d7244a3c55fbccf9ecf7a7e4921c7d995482cad 100755
|
| --- a/build/android/gyp/write_build_config.py
|
| +++ b/build/android/gyp/write_build_config.py
|
| @@ -169,21 +169,24 @@ def main(argv):
|
| java_libraries_list = []
|
| if options.native_libs:
|
| libraries = build_utils.ParseGypList(options.native_libs)
|
| - libraries_dir = os.path.dirname(libraries[0])
|
| - write_ordered_libraries.SetReadelfPath(options.readelf_path)
|
| - write_ordered_libraries.SetLibraryDirs([libraries_dir])
|
| - all_native_library_deps = (
|
| - write_ordered_libraries.GetSortedTransitiveDependenciesForBinaries(
|
| - libraries))
|
| - java_libraries_list = '{%s}' % ','.join(
|
| - ['"%s"' % s for s in all_native_library_deps])
|
| - library_paths = map(
|
| - write_ordered_libraries.FullLibraryPath, all_native_library_deps)
|
| -
|
| - config['native'] = {
|
| - 'libraries': library_paths,
|
| - 'java_libraries_list': java_libraries_list
|
| - }
|
| + if libraries:
|
| + libraries_dir = os.path.dirname(libraries[0])
|
| + write_ordered_libraries.SetReadelfPath(options.readelf_path)
|
| + write_ordered_libraries.SetLibraryDirs([libraries_dir])
|
| + all_native_library_deps = (
|
| + write_ordered_libraries.GetSortedTransitiveDependenciesForBinaries(
|
| + libraries))
|
| + # Create a java literal array with the "base" library names:
|
| + # e.g. libfoo.so -> foo
|
| + java_libraries_list = '{%s}' % ','.join(
|
| + ['"%s"' % s[3:-3] for s in all_native_library_deps])
|
| + library_paths = map(
|
| + write_ordered_libraries.FullLibraryPath, all_native_library_deps)
|
| +
|
| + config['native'] = {
|
| + 'libraries': library_paths,
|
| + 'java_libraries_list': java_libraries_list
|
| + }
|
|
|
| build_utils.WriteJson(config, options.build_config, only_if_changed=True)
|
|
|
|
|