Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(985)

Unified Diff: chrome/chrome_tests_unit.gypi

Issue 11418005: Get a minimal unit_tests target building and running for iOS (Closed) Base URL: http://git.chromium.org/chromium/src.git@chrome-gyp-ios-support
Patch Set: Better ifdefing in chrome_paths Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/chrome_common.gypi ('k') | chrome/common/chrome_content_client_ios.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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': [
{
« no previous file with comments | « chrome/chrome_common.gypi ('k') | chrome/common/chrome_content_client_ios.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698