Skip to content

Commit 6d17ce6

Browse files
authored
switched to using the ocmock build file in //build (flutter#17707)
1 parent 1dabddf commit 6d17ce6

File tree

5 files changed

+5
-93
lines changed

5 files changed

+5
-93
lines changed

DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ allowed_hosts = [
139139
]
140140

141141
deps = {
142-
'src': 'https://github.com/flutter/buildroot.git' + '@' + '036715c76da60220b39312ea066cd65d32c2157d',
142+
'src': 'https://github.com/flutter/buildroot.git' + '@' + '1b6a1b344074a1105b2e9b1c714766bace22acd7',
143143

144144
# Fuchsia compatibility
145145
#

shell/platform/darwin/ios/BUILD.gn

Lines changed: 1 addition & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,6 @@ _flutter_framework_headers = [
3737

3838
_flutter_framework_headers_copy_dir = "$_flutter_framework_dir/Headers"
3939

40-
# TODO(54502): move this variable into //build/config/ios/ios_sdk.gni
41-
# Version of iOS that we're targeting for tests.
42-
ios_testing_deployment_target = "13.0"
43-
4440
source_set("flutter_framework_source") {
4541
visibility = [ ":*" ]
4642
cflags_objc = flutter_cflags_objc
@@ -150,89 +146,6 @@ source_set("flutter_framework_source") {
150146
]
151147
}
152148

153-
ocmock_path = "../../../../../third_party/ocmock/Source"
154-
155-
# TODO(54503): Clone the OCMock repository so we can add a BUILD.gn to it.
156-
static_library("ocmock") {
157-
configs -= [ "//build/config/compiler:chromium_code" ]
158-
cflags = [
159-
"-fvisibility=default",
160-
"-mios-simulator-version-min=$ios_testing_deployment_target",
161-
"-Wno-misleading-indentation",
162-
]
163-
sources = [
164-
"$ocmock_path/OCMock/NSInvocation+OCMAdditions.h",
165-
"$ocmock_path/OCMock/NSInvocation+OCMAdditions.m",
166-
"$ocmock_path/OCMock/NSMethodSignature+OCMAdditions.h",
167-
"$ocmock_path/OCMock/NSMethodSignature+OCMAdditions.m",
168-
"$ocmock_path/OCMock/NSNotificationCenter+OCMAdditions.h",
169-
"$ocmock_path/OCMock/NSNotificationCenter+OCMAdditions.m",
170-
"$ocmock_path/OCMock/NSObject+OCMAdditions.h",
171-
"$ocmock_path/OCMock/NSObject+OCMAdditions.m",
172-
"$ocmock_path/OCMock/NSValue+OCMAdditions.h",
173-
"$ocmock_path/OCMock/NSValue+OCMAdditions.m",
174-
"$ocmock_path/OCMock/OCClassMockObject.h",
175-
"$ocmock_path/OCMock/OCClassMockObject.m",
176-
"$ocmock_path/OCMock/OCMArg.h",
177-
"$ocmock_path/OCMock/OCMArg.m",
178-
"$ocmock_path/OCMock/OCMArgAction.h",
179-
"$ocmock_path/OCMock/OCMArgAction.m",
180-
"$ocmock_path/OCMock/OCMBlockArgCaller.h",
181-
"$ocmock_path/OCMock/OCMBlockArgCaller.m",
182-
"$ocmock_path/OCMock/OCMBlockCaller.h",
183-
"$ocmock_path/OCMock/OCMBlockCaller.m",
184-
"$ocmock_path/OCMock/OCMBoxedReturnValueProvider.h",
185-
"$ocmock_path/OCMock/OCMBoxedReturnValueProvider.m",
186-
"$ocmock_path/OCMock/OCMConstraint.h",
187-
"$ocmock_path/OCMock/OCMConstraint.m",
188-
"$ocmock_path/OCMock/OCMExceptionReturnValueProvider.h",
189-
"$ocmock_path/OCMock/OCMExceptionReturnValueProvider.m",
190-
"$ocmock_path/OCMock/OCMExpectationRecorder.h",
191-
"$ocmock_path/OCMock/OCMExpectationRecorder.m",
192-
"$ocmock_path/OCMock/OCMFunctions.h",
193-
"$ocmock_path/OCMock/OCMFunctions.m",
194-
"$ocmock_path/OCMock/OCMFunctionsPrivate.h",
195-
"$ocmock_path/OCMock/OCMIndirectReturnValueProvider.h",
196-
"$ocmock_path/OCMock/OCMIndirectReturnValueProvider.m",
197-
"$ocmock_path/OCMock/OCMInvocationExpectation.h",
198-
"$ocmock_path/OCMock/OCMInvocationExpectation.m",
199-
"$ocmock_path/OCMock/OCMInvocationMatcher.h",
200-
"$ocmock_path/OCMock/OCMInvocationMatcher.m",
201-
"$ocmock_path/OCMock/OCMInvocationStub.h",
202-
"$ocmock_path/OCMock/OCMInvocationStub.m",
203-
"$ocmock_path/OCMock/OCMLocation.h",
204-
"$ocmock_path/OCMock/OCMLocation.m",
205-
"$ocmock_path/OCMock/OCMMacroState.h",
206-
"$ocmock_path/OCMock/OCMMacroState.m",
207-
"$ocmock_path/OCMock/OCMNotificationPoster.h",
208-
"$ocmock_path/OCMock/OCMNotificationPoster.m",
209-
"$ocmock_path/OCMock/OCMObserverRecorder.h",
210-
"$ocmock_path/OCMock/OCMObserverRecorder.m",
211-
"$ocmock_path/OCMock/OCMPassByRefSetter.h",
212-
"$ocmock_path/OCMock/OCMPassByRefSetter.m",
213-
"$ocmock_path/OCMock/OCMRealObjectForwarder.h",
214-
"$ocmock_path/OCMock/OCMRealObjectForwarder.m",
215-
"$ocmock_path/OCMock/OCMRecorder.h",
216-
"$ocmock_path/OCMock/OCMRecorder.m",
217-
"$ocmock_path/OCMock/OCMReturnValueProvider.h",
218-
"$ocmock_path/OCMock/OCMReturnValueProvider.m",
219-
"$ocmock_path/OCMock/OCMStubRecorder.h",
220-
"$ocmock_path/OCMock/OCMStubRecorder.m",
221-
"$ocmock_path/OCMock/OCMVerifier.h",
222-
"$ocmock_path/OCMock/OCMVerifier.m",
223-
"$ocmock_path/OCMock/OCMock.h",
224-
"$ocmock_path/OCMock/OCMockObject.h",
225-
"$ocmock_path/OCMock/OCMockObject.m",
226-
"$ocmock_path/OCMock/OCObserverMockObject.h",
227-
"$ocmock_path/OCMock/OCObserverMockObject.m",
228-
"$ocmock_path/OCMock/OCPartialMockObject.h",
229-
"$ocmock_path/OCMock/OCPartialMockObject.m",
230-
"$ocmock_path/OCMock/OCProtocolMockObject.h",
231-
"$ocmock_path/OCMock/OCProtocolMockObject.m",
232-
]
233-
include_dirs = [ "$ocmock_path" ]
234-
}
235-
236149
ios_test_flutter_path = rebase_path("$root_out_dir/libios_test_flutter.dylib")
237150
platform_frameworks_path = "$ios_sdk_path/../../Library/Frameworks/"
238151

@@ -266,11 +179,10 @@ shared_library("ios_test_flutter") {
266179
]
267180
deps = [
268181
":flutter_framework_source",
269-
":ocmock",
270182
"//flutter/shell/platform/darwin/common:framework_shared",
183+
"//third_party/ocmock:ocmock",
271184
"//third_party/skia",
272185
]
273-
include_dirs = [ "$ocmock_path" ]
274186
public_configs = [ "//flutter:config" ]
275187
}
276188

shell/platform/darwin/ios/framework/Source/FlutterPluginAppLifeCycleDelegateTest.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
#import <OCMock/OCMock.h>
65
#import <XCTest/XCTest.h>
76
#include "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h"
87
#import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterPluginAppLifeCycleDelegate.h"
8+
#import "third_party/ocmock/Source/OCMock/OCMock.h"
99

1010
FLUTTER_ASSERT_ARC
1111

shell/platform/darwin/ios/framework/Source/FlutterTextInputPluginTest.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
#import <OCMock/OCMock.h>
65
#import <XCTest/XCTest.h>
76
#include "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h"
87
#import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterEngine.h"
98
#include "flutter/shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.h"
9+
#import "third_party/ocmock/Source/OCMock/OCMock.h"
1010

1111
FLUTTER_ASSERT_ARC
1212

shell/platform/darwin/ios/framework/Source/SemanticsObjectTest.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
#import <OCMock/OCMock.h>
21
#import <XCTest/XCTest.h>
32

43
#include "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h"
54
#import "flutter/shell/platform/darwin/ios/framework/Source/SemanticsObject.h"
5+
#import "third_party/ocmock/Source/OCMock/OCMock.h"
66

77
FLUTTER_ASSERT_ARC
88

0 commit comments

Comments
 (0)