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

Unified Diff: chrome/android/chrome_apk.gyp

Issue 2130453004: [Sync] Move //sync to //components/sync. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. 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
« no previous file with comments | « chrome/android/BUILD.gn ('k') | chrome/android/java/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/chrome_apk.gyp
diff --git a/chrome/android/chrome_apk.gyp b/chrome/android/chrome_apk.gyp
index f626741779b02adddbe201ee8f1c50bc6d64e562..15be33a23507a65339b797ba7f44fbf1b9e54371 100644
--- a/chrome/android/chrome_apk.gyp
+++ b/chrome/android/chrome_apk.gyp
@@ -141,8 +141,8 @@
],
'dependencies': [
'libchrome_base',
- '../../sync/sync.gyp:sync',
- '../../sync/sync.gyp:test_support_sync_fake_server_android',
+ '../../components/sync.gyp:sync',
+ '../../components/sync.gyp:test_support_sync_fake_server_android',
],
},
{
@@ -245,7 +245,7 @@
# This exists here because com.google.protobuf.nano is needed in tests,
# but that code is stripped out via proguard. Adding this deps adds
# usages and prevents removal of the proto code.
- '../../sync/sync.gyp:test_support_sync_proto_java',
+ '../../components/sync.gyp:test_support_sync_proto_java',
],
'includes': [ 'chrome_apk.gypi' ],
},
@@ -283,7 +283,7 @@
'../../mojo/mojo_public.gyp:mojo_public_java',
'../../net/net.gyp:net_java',
'../../net/net.gyp:net_java_test_support',
- '../../sync/sync.gyp:sync_java_test_support',
+ '../../components/sync.gyp:sync_java_test_support',
'../../third_party/android_tools/android_tools.gyp:android_support_v7_appcompat_javalib',
'../../third_party/android_tools/android_tools.gyp:google_play_services_javalib',
'../../third_party/WebKit/public/blink.gyp:android_mojo_bindings_java',
@@ -359,10 +359,10 @@
'../../base/base.gyp:base_java_test_support',
'../../chrome/chrome.gyp:chrome_java',
'../../chrome/chrome.gyp:chrome_java_test_support',
- '../../sync/sync.gyp:sync_java',
- '../../sync/sync.gyp:sync_java_test_support',
- '../../sync/sync.gyp:sync_javatests',
- '../../sync/sync.gyp:test_support_sync_proto_java',
+ '../../components/sync.gyp:sync_java',
+ '../../components/sync.gyp:sync_java_test_support',
+ '../../components/sync.gyp:sync_javatests',
+ '../../components/sync.gyp:test_support_sync_proto_java',
'../../testing/android/on_device_instrumentation.gyp:broker_java',
'../../testing/android/on_device_instrumentation.gyp:require_driver_apk',
],
« no previous file with comments | « chrome/android/BUILD.gn ('k') | chrome/android/java/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698