Index: tools/mb/mb.py |
diff --git a/tools/mb/mb.py b/tools/mb/mb.py |
index 7335448bd5a15ddcc913a338ae361637743284e6..4e0262ea57eec3be10b06a294648087f65d0d2bc 100755 |
--- a/tools/mb/mb.py |
+++ b/tools/mb/mb.py |
@@ -886,6 +886,17 @@ class MetaBuildWrapper(object): |
command, extra_files = self.GetIsolateCommand(target, vals) |
runtime_deps = self.ReadFile(runtime_deps_path).splitlines() |
+ if android: |
+ # TODO(hzl): Rewrite the following lib.unstripped logic. |
+ # crbug.com/749283 |
+ unstripped_libs = [] |
+ for f in runtime_deps: |
+ if f.endswith('.so'): |
+ if os.path.isfile(self.PathJoin(self.ToAbsPath(build_dir), |
+ 'lib.unstripped', |
+ os.path.basename(f))): |
+ unstripped_libs.append('lib.unstripped/%s' % os.path.basename(f)) |
+ runtime_deps.extend(unstripped_libs) |
self.WriteIsolateFiles(build_dir, command, target, runtime_deps, |
extra_files) |