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

Unified Diff: chrome/chrome_shell.gypi

Issue 1305213003: Convert ChromeSyncShell to use ChromePublic infrastructure (try #2) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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/browser/android/chrome_sync_shell_main_delegate_initializer.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_shell.gypi
diff --git a/chrome/chrome_shell.gypi b/chrome/chrome_shell.gypi
index 7e2e8f562a2be5da66e77fcd4a86843870a15c88..b48a169c0521fe7d22c857f496e05379633a2eb6 100644
--- a/chrome/chrome_shell.gypi
+++ b/chrome/chrome_shell.gypi
@@ -57,21 +57,6 @@
],
},
{
- # GN: //chrome/android:chrome_sync_shell
- 'target_name': 'libchromesyncshell',
- 'type': 'shared_library',
- 'sources': [
- 'android/shell/chrome_shell_entry_point.cc',
- 'android/sync_shell/chrome_main_delegate_chrome_sync_shell_android.cc',
- 'android/sync_shell/chrome_main_delegate_chrome_sync_shell_android.h',
- ],
- 'dependencies': [
- 'libchromeshell_base',
- '../sync/sync.gyp:sync_core',
- '../sync/sync.gyp:test_support_sync_fake_server_android',
- ],
- },
- {
# GN: //chrome/android:chrome_shell_manifest
'target_name': 'chrome_shell_manifest',
'type': 'none',
@@ -122,56 +107,6 @@
],
'includes': [ '../build/apk_fake_jar.gypi' ],
},
- {
- # GN: //chrome/android:chrome_sync_shell_manifest
- 'target_name': 'chrome_sync_shell_manifest',
- 'type': 'none',
- 'variables': {
- 'jinja_inputs': ['android/sync_shell/java/AndroidManifest.xml.jinja2'],
- 'jinja_output': '<(SHARED_INTERMEDIATE_DIR)/chrome_sync_shell_manifest/AndroidManifest.xml',
- },
- 'includes': [ '../build/android/jinja_template.gypi' ],
- },
- {
- # GN: //chrome/android:chrome_sync_shell_apk
- 'target_name': 'chrome_sync_shell_apk',
- 'type': 'none',
- 'dependencies': [
- 'chrome_java',
- 'chrome_android_paks_copy',
- 'libchromesyncshell',
- '../media/media.gyp:media_java',
- '../sync/sync.gyp:sync_java_test_support',
- ],
- 'variables': {
- 'apk_name': 'ChromeSyncShell',
- 'android_manifest_path': '<(SHARED_INTERMEDIATE_DIR)/chrome_sync_shell_manifest/AndroidManifest.xml',
- 'R_package': 'org.chromium.chrome.shell',
- 'native_lib_version_name': '<(version_full)',
- 'java_in_dir': 'android/shell/java',
- 'resource_dir': 'android/shell/res',
- 'asset_location': '<(PRODUCT_DIR)/assets/<(package_name)',
- 'native_lib_target': 'libchromesyncshell',
- 'additional_input_paths': [
- '<@(chrome_android_pak_output_resources)',
- ],
- },
- 'includes': [ '../build/java_apk.gypi', ],
- },
- {
- # GN: N/A
- # chrome_sync_shell_apk creates a .jar as a side effect. Any java
- # targets that need that .jar in their classpath should depend on this
- # target. Dependents of chrome_sync_shell_apk receive its jar path in the
- # variable 'apk_output_jar_path'. This target should only be used by
- # targets which instrument chrome_sync_shell_apk.
- 'target_name': 'chrome_sync_shell_apk_java',
- 'type': 'none',
- 'dependencies': [
- 'chrome_sync_shell_apk',
- ],
- 'includes': [ '../build/apk_fake_jar.gypi' ],
- },
],
}
« no previous file with comments | « chrome/browser/android/chrome_sync_shell_main_delegate_initializer.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698