testing/iossim/iossim.mm - Issue 1124763003: Update from https://crrev.com/327068

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: testing/iossim/iossim.mm

Issue 1124763003: Update from https://crrev.com/327068 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: update nacl, buildtools, fix display_change_notifier_unittest Created 5 years, 7 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:

Index: testing/iossim/iossim.mm

diff --git a/testing/iossim/iossim.mm b/testing/iossim/iossim.mm

index 83cfe9274c9b280dd46f49ef1ee65add4e0deb5d..2f2af8d239ec0e995a382bfb3485d0ee20b8bd4d 100644

--- a/testing/iossim/iossim.mm

+++ b/testing/iossim/iossim.mm

@@ -850,7 +850,8 @@ int main(int argc, char* const argv[]) {

NSString* appPath = nil;

NSString* appName = nil;

NSString* sdkVersion = nil;

- NSString* deviceName = IsRunningWithXcode6OrLater() ? @"iPhone 5" : @"iPhone";

+ NSString* deviceName =

+ IsRunningWithXcode6OrLater() ? @"iPhone 5s" : @"iPhone";

NSString* simHomePath = nil;

NSMutableArray* appArgs = [NSMutableArray array];

NSMutableDictionary* appEnv = [NSMutableDictionary dictionary];