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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/sync/sync_tests.gypi

Issue 2155763002: [Sync] //components/sync manual changes [DO NOT SUBMIT] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@sc-automated
Patch Set: Couple format corrections. Created 4 years, 5 months 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
« components/sync/engine_impl/DEPS ('K') | « components/sync/sessions_impl/DEPS ('k') | components/sync/syncable/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/sync/sync_tests.gypi
diff --git a/components/sync/sync_tests.gypi b/components/sync/sync_tests.gypi
index 2cf10d8e0cb2efc63b4b17a30bc4522ef54516f8..9dfd496f1926941ca018ef58c7d10d08ba86ea12 100644
--- a/components/sync/sync_tests.gypi
+++ b/components/sync/sync_tests.gypi
@@ -17,14 +17,14 @@
'SYNC_TEST'
],
'dependencies': [
- '../../base/base.gyp:base',
- '../../testing/gmock.gyp:gmock',
- '../../testing/gtest.gyp:gtest',
+ '../base/base.gyp:base',
+ '../testing/gmock.gyp:gmock',
+ '../testing/gtest.gyp:gtest',
'sync',
],
'export_dependent_settings': [
- '../../testing/gmock.gyp:gmock',
- '../../testing/gtest.gyp:gtest',
+ '../testing/gmock.gyp:gmock',
+ '../testing/gtest.gyp:gtest',
'sync',
],
'sources': [
@@ -96,15 +96,15 @@
'..',
],
'dependencies': [
- '../../base/base.gyp:base',
- '../../net/net.gyp:net_test_support',
+ '../base/base.gyp:base',
+ '../net/net.gyp:net_test_support',
# The sync test server uses Python modules generated by the sync protos.
- '../../third_party/protobuf/protobuf.gyp:py_proto',
+ '../third_party/protobuf/protobuf.gyp:py_proto',
'sync',
],
'export_dependent_settings': [
- '../../base/base.gyp:base',
- '../../net/net.gyp:net_test_support',
+ '../base/base.gyp:base',
+ '../net/net.gyp:net_test_support',
],
'sources': [
'test/local_sync_test_server.cc',
@@ -122,10 +122,10 @@
'..',
],
'dependencies': [
- '../../base/base.gyp:base',
- '../../net/net.gyp:net',
- '../../testing/gtest.gyp:gtest',
- '../../third_party/protobuf/protobuf.gyp:protobuf_lite',
+ '../base/base.gyp:base',
+ '../net/net.gyp:net',
+ '../testing/gtest.gyp:gtest',
+ '../third_party/protobuf/protobuf.gyp:protobuf_lite',
'sync',
],
'export_dependent_settings': [
@@ -172,13 +172,13 @@
'SYNC_TEST'
],
'dependencies': [
- '../../base/base.gyp:base',
- '../../testing/gtest.gyp:gtest',
+ '../base/base.gyp:base',
+ '../testing/gtest.gyp:gtest',
'sync',
'test_support_sync_core',
],
'export_dependent_settings': [
- '../../testing/gtest.gyp:gtest',
+ '../testing/gtest.gyp:gtest',
'sync',
'test_support_sync_core',
],
@@ -218,11 +218,11 @@
'SYNC_TEST'
],
'dependencies': [
- '../../testing/gmock.gyp:gmock',
+ '../testing/gmock.gyp:gmock',
'sync',
],
'export_dependent_settings': [
- '../../testing/gmock.gyp:gmock',
+ '../testing/gmock.gyp:gmock',
'sync',
],
'sources': [
@@ -254,18 +254,18 @@
'SYNC_TEST',
],
'dependencies': [
- '../../base/base.gyp:base',
- '../../base/base.gyp:run_all_unittests',
- '../../google_apis/google_apis.gyp:google_apis',
- '../../google_apis/google_apis.gyp:google_apis_test_support',
- '../../net/net.gyp:net',
- '../../net/net.gyp:net_test_support',
- '../../sql/sql.gyp:sql',
- '../../sql/sql.gyp:test_support_sql',
- '../../testing/gmock.gyp:gmock',
- '../../testing/gtest.gyp:gtest',
- '../../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
- '../../third_party/protobuf/protobuf.gyp:protobuf_lite',
+ '../base/base.gyp:base',
+ '../base/base.gyp:run_all_unittests',
+ '../google_apis/google_apis.gyp:google_apis',
+ '../google_apis/google_apis.gyp:google_apis_test_support',
+ '../net/net.gyp:net',
+ '../net/net.gyp:net_test_support',
+ '../sql/sql.gyp:sql',
+ '../sql/sql.gyp:test_support_sql',
+ '../testing/gmock.gyp:gmock',
+ '../testing/gtest.gyp:gtest',
+ '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
+ '../third_party/protobuf/protobuf.gyp:protobuf_lite',
'sync',
'test_support_sync_api',
'test_support_sync_core',
@@ -361,13 +361,13 @@
'conditions': [
['OS == "android"', {
'dependencies': [
- '../../testing/android/native_test.gyp:native_test_native_code',
+ '../testing/android/native_test.gyp:native_test_native_code',
],
}],
['OS=="linux" and chromeos==1', {
# Required by get_session_name_unittest.cc on Chrome OS.
'dependencies': [
- '../../chromeos/chromeos.gyp:chromeos',
+ '../chromeos/chromeos.gyp:chromeos',
],
}],
['OS == "ios"', {
@@ -386,10 +386,10 @@
'target_name': 'run_sync_testserver',
'type': 'executable',
'dependencies': [
- '../../base/base.gyp:base',
- '../../base/base.gyp:test_support_base',
- '../../net/net.gyp:net_test_support',
- '../../testing/gtest.gyp:gtest',
+ '../base/base.gyp:base',
+ '../base/base.gyp:test_support_base',
+ '../net/net.gyp:net_test_support',
+ '../testing/gtest.gyp:gtest',
'test_support_sync_testserver',
],
'sources': [
@@ -405,12 +405,12 @@
'target_name': 'sync_javatests',
'type': 'none',
'variables': {
- 'java_in_dir': '../../components/sync/android/javatests',
+ 'java_in_dir': '../components/sync/android/javatests',
},
'dependencies': [
'sync_java',
'sync_java_test_support',
- '../../base/base.gyp:base_java_test_support',
+ '../base/base.gyp:base_java_test_support',
],
'includes': [ '../../build/java.gypi' ],
},
@@ -419,11 +419,11 @@
'target_name': 'sync_java_test_support',
'type': 'none',
'variables': {
- 'java_in_dir': '../../components/sync/test/android/javatests',
+ 'java_in_dir': '../components/sync/test/android/javatests',
},
'dependencies': [
'sync_java',
- '../../base/base.gyp:base_java_test_support',
+ '../base/base.gyp:base_java_test_support',
],
'includes': [ '../../build/java.gypi' ],
},
@@ -432,7 +432,7 @@
'target_name': 'sync_fake_server_jni_headers',
'type': 'none',
'sources': [
- '../../chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/FakeServerHelper.java',
+ '../chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/FakeServerHelper.java',
],
'variables': {
'jni_gen_package': 'sync/test/fake_server',
@@ -483,11 +483,11 @@
'dependencies': [
'sync_fake_server_jni_headers',
'test_support_sync_fake_server',
- '../../testing/gtest.gyp:gtest',
- '../../base/base.gyp:base',
+ '../testing/gtest.gyp:gtest',
+ '../base/base.gyp:base',
],
'export_dependent_settings': [
- '../../testing/gtest.gyp:gtest',
+ '../testing/gtest.gyp:gtest',
],
'sources': [
'test/fake_server/android/fake_server_helper_android.cc',
« components/sync/engine_impl/DEPS ('K') | « components/sync/sessions_impl/DEPS ('k') | components/sync/syncable/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698