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

Unified Diff: components/sync/sync_android.gypi

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 | « components/sync/sessions_impl/test_util.cc ('k') | components/sync/sync_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/sync/sync_android.gypi
diff --git a/sync/sync_android.gypi b/components/sync/sync_android.gypi
similarity index 50%
rename from sync/sync_android.gypi
rename to components/sync/sync_android.gypi
index 5ea0f3a346c3abc67afc5db3a3c408b55838dcef..f24024317f3e8d957ffce6f4ad4f8331153d5765 100644
--- a/sync/sync_android.gypi
+++ b/components/sync/sync_android.gypi
@@ -7,51 +7,51 @@
['OS == "android"', {
'targets': [
{
- # GN: //sync/android:sync_java
+ # GN: //components/sync/android:sync_java
'target_name': 'sync_java',
'type': 'none',
'variables': {
- 'java_in_dir': '../sync/android/java',
+ 'java_in_dir': '../../components/sync/android/java',
},
'dependencies': [
'model_type_java',
'stop_source_java',
'sync_jni_headers',
- '../base/base.gyp:base_java',
- '../net/net.gyp:net_java',
- '../third_party/android_tools/android_tools.gyp:google_play_services_javalib',
- '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_javalib',
- '../third_party/jsr-305/jsr-305.gyp:jsr_305_javalib',
+ '../../base/base.gyp:base_java',
+ '../../net/net.gyp:net_java',
+ '../../third_party/android_tools/android_tools.gyp:google_play_services_javalib',
+ '../../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_javalib',
+ '../../third_party/jsr-305/jsr-305.gyp:jsr_305_javalib',
],
- 'includes': [ '../build/java.gypi' ],
+ 'includes': [ '../../build/java.gypi' ],
},
{
'target_name': 'sync_jni_headers',
'type': 'none',
'sources': [
- 'android/java/src/org/chromium/sync/ModelTypeHelper.java',
+ 'android/java/src/org/chromium/components/sync/ModelTypeHelper.java',
],
'variables': {
'jni_gen_package': 'sync',
},
- 'includes': [ '../build/jni_generator.gypi' ],
+ 'includes': [ '../../build/jni_generator.gypi' ],
},
- # GN: //sync/android:java_enums
+ # GN: //components/sync/android:java_enums
{
'target_name': 'model_type_java',
'type': 'none',
'variables': {
- 'source_file': 'internal_api/public/base/model_type.h',
+ 'source_file': 'base/model_type.h',
},
- 'includes': [ '../build/android/java_cpp_enum.gypi' ],
+ 'includes': [ '../../build/android/java_cpp_enum.gypi' ],
},
{
'target_name': 'stop_source_java',
'type': 'none',
'variables': {
- 'source_file': 'internal_api/public/base/stop_source.h',
+ 'source_file': 'base/stop_source.h',
},
- 'includes': [ '../build/android/java_cpp_enum.gypi' ],
+ 'includes': [ '../../build/android/java_cpp_enum.gypi' ],
},
],
}],
« no previous file with comments | « components/sync/sessions_impl/test_util.cc ('k') | components/sync/sync_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698