From 17ac3eb8b1e9a6b574c049e03a0e2f1d6c2f5911 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Fri, 18 Sep 2015 17:27:50 +0200
Subject: [PATCH] ios9: fix various errors including disabling dummy libraries
 bitcode support

---
 LiblinphoneTester/MasterViewController.h |  4 ++--
 TestsUI/LinphoneTestCase.m               | 20 +++++++-------------
 TestsUI/WizardTester.m                   |  5 -----
 prepare.py                               |  2 +-
 submodules/linphone                      |  2 +-
 5 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/LiblinphoneTester/MasterViewController.h b/LiblinphoneTester/MasterViewController.h
index b9d833721..3f343ac72 100644
--- a/LiblinphoneTester/MasterViewController.h
+++ b/LiblinphoneTester/MasterViewController.h
@@ -8,8 +8,8 @@
 
 #import <UIKit/UIKit.h>
 
-NSMutableArray *lastLogs;
-NSString *const kLogsUpdateNotification;
+extern NSMutableArray *lastLogs;
+extern NSString *const kLogsUpdateNotification;
 
 @class DetailViewController;
 
diff --git a/TestsUI/LinphoneTestCase.m b/TestsUI/LinphoneTestCase.m
index 842fa1de1..89148092b 100644
--- a/TestsUI/LinphoneTestCase.m
+++ b/TestsUI/LinphoneTestCase.m
@@ -27,6 +27,7 @@
 
 - (void)beforeAll {
 	[super beforeAll];
+
 #if TARGET_IPHONE_SIMULATOR
 	while ([tester acknowledgeSystemAlert]) {
 		[tester waitForTimeInterval:.5f];
@@ -40,6 +41,10 @@
 	}
 }
 
+- (void)beforeEach {
+	[[LinphoneManager instance] lpConfigSetInt:NO forKey:@"animations_preference"];
+}
+
 - (NSString *)me {
 	return [NSString
 		stringWithFormat:@"testios-%@", [[UIDevice currentDevice].identifierForVendor.UUIDString substringToIndex:6]];
@@ -61,16 +66,6 @@
 	return array;
 }
 
-static bool invalidAccount = true;
-
-- (void)setInvalidAccountSet:(BOOL)invalidAccountSet {
-	invalidAccount = invalidAccountSet;
-}
-
-- (BOOL)invalidAccountSet {
-	return invalidAccount;
-}
-
 - (BOOL)hasValidProxyConfig {
 	LinphoneCore *lc = [LinphoneManager getLc];
 	const MSList *proxies = linphone_core_get_proxy_config_list(lc);
@@ -100,7 +95,7 @@ static bool invalidAccount = true;
 - (void)switchToValidAccountIfNeeded {
 	[UIView setAnimationsEnabled:false];
 
-	if (invalidAccount && ![self hasValidProxyConfig]) {
+	if (![self hasValidProxyConfig]) {
 		LOGI(@"Switching to a test account...");
 
 		LinphoneCore *lc = [LinphoneManager getLc];
@@ -142,8 +137,7 @@ static bool invalidAccount = true;
 		[[[LinphoneManager instance] fastAddressBook] reload];
 
 		[self waitForRegistration];
-
-		invalidAccount = false;
+		[[LinphoneManager instance] lpConfigSetInt:NO forKey:@"animations_preference"];
 	}
 }
 
diff --git a/TestsUI/WizardTester.m b/TestsUI/WizardTester.m
index c21059b39..c09602afe 100644
--- a/TestsUI/WizardTester.m
+++ b/TestsUI/WizardTester.m
@@ -29,11 +29,6 @@
 	[tester tapViewWithAccessibilityLabel:@"Dialer"];
 }
 
-#pragma mark - State
-
-+ (void)switchToValidAccountWithTester:(KIFTestCase *)testCase {
-}
-
 #pragma mark - Utilities
 
 - (void)_linphoneLogin:(NSString *)username withPW:(NSString *)pw {
diff --git a/prepare.py b/prepare.py
index c34b27818..6d92cc5b4 100755
--- a/prepare.py
+++ b/prepare.py
@@ -384,7 +384,7 @@ veryclean: $(addprefix veryclean-,$(packages))
 generate-dummy-%:
 \t@echo "[{archs}] Generating dummy $* static library." ; \\
 \tprintf "void $*_init() {{}}" | tr '-' '_' > .dummy.c ; \\
-\tfor arch in {archs}; do clang -flto -emit-llvm -c .dummy.c -arch $$arch -o .dummy-$$arch.tbd; done ; \\
+\tfor arch in {archs}; do clang -c .dummy.c -arch $$arch -o .dummy-$$arch.tbd; done ; \\
 \tlipo -create -output .dummy.tbd .dummy-*.tbd; \\
 \trm .dummy-*.tbd .dummy.c
 
diff --git a/submodules/linphone b/submodules/linphone
index 096b71cd7..1213a64a6 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 096b71cd7e619c90047ff7a03731ecc24005bd7c
+Subproject commit 1213a64a64bea68b5cbcde4c5573822201c25265