diff options
| -rw-r--r-- | test/test_main_lib.cc | 4 | ||||
| -rwxr-xr-x | tools_webrtc/mb/mb.py | 7 | ||||
| -rw-r--r-- | webrtc.gni | 9 |
3 files changed, 17 insertions, 3 deletions
diff --git a/test/test_main_lib.cc b/test/test_main_lib.cc index 6e5cff175a..ea3b714ffd 100644 --- a/test/test_main_lib.cc +++ b/test/test_main_lib.cc @@ -57,7 +57,7 @@ ABSL_FLAG( "described by histogram.proto in " "https://chromium.googlesource.com/catapult/."); -#else +#endif ABSL_FLAG(std::string, isolated_script_test_output, @@ -72,8 +72,6 @@ ABSL_FLAG( "described by histogram.proto in " "https://chromium.googlesource.com/catapult/."); -#endif - constexpr char kPlotAllMetrics[] = "all"; ABSL_FLAG(std::vector<std::string>, plot, diff --git a/tools_webrtc/mb/mb.py b/tools_webrtc/mb/mb.py index d1869135b1..bbb5b6f472 100755 --- a/tools_webrtc/mb/mb.py +++ b/tools_webrtc/mb/mb.py @@ -900,6 +900,7 @@ class MetaBuildWrapper: is_android = 'target_os="android"' in vals['gn_args'] is_linux = self.platform.startswith('linux') and not is_android + is_ios = 'target_os="ios"' in vals['gn_args'] if test_type == 'nontest': self.WriteFailureAndRaise('We should not be isolating %s.' % target, @@ -932,6 +933,12 @@ class MetaBuildWrapper: '--logcat-output-file', '${ISOLATED_OUTDIR}/logcats', '--store-tombstones' ] + elif is_ios: + cmdline += [ + vpython_exe, '../../tools_webrtc/flags_compatibility.py', + 'bin/run_%s' % target, '--out-dir', '${ISOLATED_OUTDIR}' + ] + extra_files.append('../../tools_webrtc/flags_compatibility.py') else: if test_type == 'raw': cmdline += [vpython_exe, '../../tools_webrtc/flags_compatibility.py'] diff --git a/webrtc.gni b/webrtc.gni index 6e81fc4285..8040f628d9 100644 --- a/webrtc.gni +++ b/webrtc.gni @@ -530,6 +530,15 @@ template("rtc_test") { [ "//third_party/llvm-build/Release+Asserts/lib/libstdc++.so.6" ] } } + # TODO(crbug.com/webrtc/13556): Adding the .app folder in the runtime_deps + # shoulnd't be necessary. this code should be removed and the same solution + # as Chromium should be used. + if (is_ios) { + if (!defined(invoker.data)) { + data = [] + } + data += [ "${root_out_dir}/${target_name}.app" ] + } } } |