mirror of
https://gitlab.linphone.org/BC/public/linphone-iphone.git
synced 2026-01-17 11:08:06 +00:00
ios9: fix various errors including disabling dummy libraries bitcode support
This commit is contained in:
parent
1aa908fef4
commit
17ac3eb8b1
5 changed files with 11 additions and 22 deletions
|
|
@ -8,8 +8,8 @@
|
|||
|
||||
#import <UIKit/UIKit.h>
|
||||
|
||||
NSMutableArray *lastLogs;
|
||||
NSString *const kLogsUpdateNotification;
|
||||
extern NSMutableArray *lastLogs;
|
||||
extern NSString *const kLogsUpdateNotification;
|
||||
|
||||
@class DetailViewController;
|
||||
|
||||
|
|
|
|||
|
|
@ -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"];
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -29,11 +29,6 @@
|
|||
[tester tapViewWithAccessibilityLabel:@"Dialer"];
|
||||
}
|
||||
|
||||
#pragma mark - State
|
||||
|
||||
+ (void)switchToValidAccountWithTester:(KIFTestCase *)testCase {
|
||||
}
|
||||
|
||||
#pragma mark - Utilities
|
||||
|
||||
- (void)_linphoneLogin:(NSString *)username withPW:(NSString *)pw {
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 096b71cd7e619c90047ff7a03731ecc24005bd7c
|
||||
Subproject commit 1213a64a64bea68b5cbcde4c5573822201c25265
|
||||
Loading…
Add table
Reference in a new issue