| Index: chrome/chrome_tests_unit.gypi
|
| diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
|
| index 6c5b2b1400247fc67a22009f55eb3053b90c0312..1678156720520ad07332f6b12a16eedf3921f90b 100644
|
| --- a/chrome/chrome_tests_unit.gypi
|
| +++ b/chrome/chrome_tests_unit.gypi
|
| @@ -286,6 +286,8 @@
|
| ['include', '_ios\\.(cc|mm)$'],
|
| ['include', '(^|/)ios/'],
|
| # TODO(ios): Add files here as they are updated to compile on iOS.
|
| + ['include', '^test/base/chrome_test_suite\\.cc$'],
|
| + ['include', '^test/base/testing_browser_process'],
|
| ],
|
| }],
|
| ['chromeos==0', {
|
| @@ -308,7 +310,7 @@
|
| '../build/linux/system.gyp:ssl',
|
| ],
|
| }],
|
| - ['OS!="android"', {
|
| + ['OS!="android" and OS!="ios"', {
|
| 'dependencies': [
|
| 'service',
|
| ],
|
| @@ -383,7 +385,6 @@
|
| '../sync/sync.gyp:test_support_sync_notifier',
|
| 'test_support_unit',
|
| # 3) anything tests directly depend on
|
| - '../device/device.gyp:device_bluetooth_mocks',
|
| '../google_apis/google_apis.gyp:google_apis',
|
| '../skia/skia.gyp:skia',
|
| '../third_party/bzip2/bzip2.gyp:bzip2',
|
| @@ -1622,6 +1623,7 @@
|
| ['OS!="ios"', {
|
| 'dependencies': [
|
| 'common/extensions/api/api.gyp:api',
|
| + '../device/device.gyp:device_bluetooth_mocks',
|
| '../gpu/gpu.gyp:gpu_unittest_utils',
|
| '../ppapi/ppapi_internal.gyp:ppapi_unittest_shared',
|
| '../third_party/cld/cld.gyp:cld',
|
| @@ -1645,6 +1647,8 @@
|
| ['include', '_ios\\.(cc|mm)$'],
|
| ['include', '(^|/)ios/'],
|
| # TODO(ios): Add files here as they are updated to compile on iOS.
|
| + ['include', '^common/bzip2_unittest\\.cc$'],
|
| + ['include', '^common/zip_'],
|
| ],
|
| 'actions': [
|
| {
|
|
|