Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(970)

Unified Diff: build/android/gyp/write_ordered_libraries.py

Issue 334783006: Allow the mojo shell to run on android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/android/gyp/strip_library_for_device.py ('k') | build/android/strip_native_libraries.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 dcb5064cf28caaea59cb2f1c72a10d2984411871..b1e3cec811b4403b2bf0454e7b898192f6dd5421 100755
--- a/build/android/gyp/write_ordered_libraries.py
+++ b/build/android/gyp/write_ordered_libraries.py
@@ -33,7 +33,11 @@ _library_re = re.compile(
def FullLibraryPath(library_name):
- return '%s/%s' % (_options.libraries_dir, library_name)
+ for directory in _options.libraries_dir.split(','):
+ path = '%s/%s' % (directory, library_name)
+ if os.path.exists(path):
+ return path
+ return library_name
def IsSystemLibrary(library_name):
@@ -106,11 +110,12 @@ def main():
_options, _ = parser.parse_args()
libraries = build_utils.ParseGypList(_options.input_libraries)
- if libraries[0].endswith('.so'):
- libraries = [os.path.basename(lib) for lib in libraries]
- libraries = GetSortedTransitiveDependencies(libraries)
- else:
- libraries = GetSortedTransitiveDependenciesForExecutable(libraries[0])
+ if len(libraries):
+ if libraries[0].endswith('.so'):
+ libraries = [os.path.basename(lib) for lib in libraries]
+ libraries = GetSortedTransitiveDependencies(libraries)
+ else:
+ libraries = GetSortedTransitiveDependenciesForExecutable(libraries[0])
build_utils.WriteJson(libraries, _options.output, only_if_changed=True)
« no previous file with comments | « build/android/gyp/strip_library_for_device.py ('k') | build/android/strip_native_libraries.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698