Index: chrome/android/chrome_apk.gyp |
diff --git a/chrome/android/chrome_apk.gyp b/chrome/android/chrome_apk.gyp |
index f5df8f361ed5c22b96549503ffe92b745243eb65..f1ca5cd930d4b7d48f6357275b66f5c6aed91618 100644 |
--- a/chrome/android/chrome_apk.gyp |
+++ b/chrome/android/chrome_apk.gyp |
@@ -23,10 +23,18 @@ |
'../app/android/chrome_main_delegate_android_initializer.cc', |
'../browser/android/chrome_entry_point.cc', |
], |
+ |
+ # This list is shared with GN. |
+ 'chrome_sync_shell_app_native_sources': [ |
+ '../browser/android/chrome_entry_point.cc', |
+ '../browser/android/chrome_sync_shell_main_delegate_initializer.cc', |
+ '../browser/android/chrome_sync_shell_main_delegate.h', |
+ '../browser/android/chrome_sync_shell_main_delegate.cc', |
+ ] |
}, |
'targets': [ |
{ |
- #GN: //chrome/android::custom_tabs_service_aidl |
+ # GN: //chrome/android::custom_tabs_service_aidl |
'target_name': 'custom_tabs_service_aidl', |
'type': 'none', |
'variables': { |
@@ -40,8 +48,8 @@ |
'includes': [ '../../build/java_aidl.gypi' ], |
}, |
{ |
- # GN: //chrome/android:chrome_public_template_resources |
- 'target_name': 'chrome_public_template_resources', |
+ # GN: //chrome/android:chrome_public_apk_template_resources |
+ 'target_name': 'chrome_public_apk_template_resources', |
'type': 'none', |
'variables': { |
'jinja_inputs_base_dir': 'java/res_template', |
@@ -63,9 +71,8 @@ |
'includes': [ '../../build/android/jinja_template.gypi' ], |
}, |
{ |
- # TODO(pvalenzuela): Implement this target with GN: |
- # http://crbug.com/475612 |
- 'target_name': 'chrome_sync_shell_template_resources', |
+ # GN: //chrome/android:chrome_sync_shell_apk_template_resources |
+ 'target_name': 'chrome_sync_shell_apk_template_resources', |
'type': 'none', |
'variables': { |
'jinja_inputs_base_dir': 'java/res_template', |
@@ -139,15 +146,11 @@ |
], |
}, |
{ |
- # TODO(pvalenzuela): Implement this target with GN: |
- # http://crbug.com/475612 |
+ # GN: //chrome/android:chrome_sync_shell |
'target_name': 'libchrome_sync_shell', |
'type': 'shared_library', |
'sources': [ |
- '../browser/android/chrome_entry_point.cc', |
- '../browser/android/chrome_sync_shell_main_delegate_initializer.cc', |
- '../browser/android/chrome_sync_shell_main_delegate.h', |
- '../browser/android/chrome_sync_shell_main_delegate.cc', |
+ '<@(chrome_sync_shell_app_native_sources)', |
], |
'dependencies': [ |
'libchrome_public_base', |
@@ -173,9 +176,8 @@ |
'includes': [ '../../build/android/jinja_template.gypi' ], |
}, |
{ |
- # TODO(pvalenzuela): Implement this target with GN: |
- # http://crbug.com/475612 |
- 'target_name': 'chrome_sync_shell_manifest', |
+ # GN: //chrome/android:chrome_sync_shell_apk_manifest |
+ 'target_name': 'chrome_sync_shell_apk_manifest', |
'type': 'none', |
'variables': { |
'jinja_inputs': ['java/AndroidManifest.xml'], |
@@ -213,7 +215,7 @@ |
}, |
'dependencies': [ |
'chrome_android_paks_copy', |
- 'chrome_public_template_resources', |
+ 'chrome_public_apk_template_resources', |
'libchrome_public', |
'../chrome.gyp:chrome_java', |
], |
@@ -231,8 +233,7 @@ |
'includes': [ '../../build/apk_fake_jar.gypi' ], |
}, |
{ |
- # TODO(pvalenzuela): Implement this target with GN: |
- # http://crbug.com/475612 |
+ # GN: //chrome/android:chrome_sync_shell_apk |
'target_name': 'chrome_sync_shell_apk', |
'type': 'none', |
'variables': { |
@@ -253,7 +254,7 @@ |
}, |
'dependencies': [ |
'chrome_android_paks_copy', |
- 'chrome_sync_shell_template_resources', |
+ 'chrome_sync_shell_apk_template_resources', |
'libchrome_sync_shell', |
'../chrome.gyp:chrome_java', |
# This exists here because com.google.protobuf.nano is needed in tests, |
@@ -316,8 +317,7 @@ |
'includes': [ '../../build/android/jinja_template.gypi' ], |
}, |
{ |
- # TODO(pvalenzuela): Implement this target with GN: |
- # http://crbug.com/475612 |
+ # GN: //chrome/android:chrome_sync_shell_test_apk_manifest |
'target_name': 'chrome_sync_shell_test_apk_manifest', |
'type': 'none', |
'variables': { |
@@ -355,8 +355,7 @@ |
], |
}, |
{ |
- # TODO(pvalenzuela): Implement this target with GN: |
- # http://crbug.com/475612 |
+ # GN: //chrome/android:chrome_sync_shell_test_apk |
'target_name': 'chrome_sync_shell_test_apk', |
'type': 'none', |
'dependencies': [ |