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

Unified Diff: chrome/chrome_browser.gypi

Issue 472213002: Mark some files/targets as compiled only when their associated feature is enabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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/BUILD.gn ('k') | chrome/chrome_resources.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index d674cdc860da9d1fc46a0b910b2adce5140e0680..16dfac186d6cc96d37536d19f31e84875ec60850 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -698,9 +698,6 @@
# TODO(brettw) should this go with the webrtc sources?
'browser/media/webrtc_log_list.cc',
'browser/media/webrtc_log_list.h',
- 'browser/media_galleries/gallery_watch_manager.cc',
- 'browser/media_galleries/gallery_watch_manager.h',
- 'browser/media_galleries/gallery_watch_manager_observer.h',
'browser/memory_details.cc',
'browser/memory_details.h',
'browser/memory_details_android.cc',
@@ -1904,8 +1901,6 @@
],
# Used both when enable_printing == 1 (full) and == 2 (basic)
'chrome_browser_basic_printing_sources': [
- 'browser/printing/print_dialog_cloud.cc',
- 'browser/printing/print_dialog_cloud.h',
'browser/printing/print_job.cc',
'browser/printing/print_job.h',
'browser/printing/print_job_manager.cc',
@@ -1934,6 +1929,8 @@
'browser/printing/cloud_print/cloud_print_proxy_service_factory.cc',
'browser/printing/cloud_print/cloud_print_proxy_service_factory.h',
'browser/printing/cloud_print/cloud_print_proxy_service.h',
+ 'browser/printing/print_dialog_cloud.cc',
+ 'browser/printing/print_dialog_cloud.h',
'browser/printing/printer_manager_dialog.h',
'browser/printing/printer_manager_dialog_linux.cc',
'browser/printing/printer_manager_dialog_mac.mm',
@@ -2122,6 +2119,9 @@
'browser/media_galleries/fileapi/supported_audio_video_checker.h',
'browser/media_galleries/fileapi/supported_image_type_validator.cc',
'browser/media_galleries/fileapi/supported_image_type_validator.h',
+ 'browser/media_galleries/gallery_watch_manager.cc',
+ 'browser/media_galleries/gallery_watch_manager.h',
+ 'browser/media_galleries/gallery_watch_manager_observer.h',
'browser/media_galleries/imported_media_gallery_registry.cc',
'browser/media_galleries/imported_media_gallery_registry.h',
'browser/media_galleries/linux/mtp_device_delegate_impl_linux.cc',
@@ -3504,34 +3504,6 @@
},
'includes': [ '../build/protoc.gypi' ]
},
- {
- # Protobuf compiler / generator for Sync FileSystem protocol buffer.
- # GN version: //chrome/browser/sync_file_system:sync_file_system_proto
- 'target_name': 'sync_file_system_proto',
- 'type': 'static_library',
- 'sources': [
- 'browser/sync_file_system/sync_file_system.proto',
- ],
- 'variables': {
- 'proto_in_dir': 'browser/sync_file_system',
- 'proto_out_dir': 'chrome/browser/sync_file_system',
- },
- 'includes': [ '../build/protoc.gypi' ]
- },
- {
- # Protobuf compiler / generator for Sync FileSystem protocol buffer.
- # GN version: //chrome/browser/sync_file_system/drive_backend:sync_file_system_drive_proto
- 'target_name': 'sync_file_system_drive_proto',
- 'type': 'static_library',
- 'sources': [
- 'browser/sync_file_system/drive_backend/metadata_database.proto',
- ],
- 'variables': {
- 'proto_in_dir': 'browser/sync_file_system/drive_backend',
- 'proto_out_dir': 'chrome/browser/sync_file_system/drive_backend',
- },
- 'includes': [ '../build/protoc.gypi' ]
- },
],
'conditions': [
['OS=="android"', {
@@ -3618,7 +3590,38 @@
'includes': [ '../build/android/java_cpp_template.gypi' ],
},
],
- },
- ],
+ },],
+ ['enable_extensions==1', {
+ 'targets': [
+ {
+ # Protobuf compiler / generator for Sync FileSystem protocol buffer.
+ # GN version: //chrome/browser/sync_file_system:sync_file_system_proto
+ 'target_name': 'sync_file_system_proto',
+ 'type': 'static_library',
+ 'sources': [
+ 'browser/sync_file_system/sync_file_system.proto',
+ ],
+ 'variables': {
+ 'proto_in_dir': 'browser/sync_file_system',
+ 'proto_out_dir': 'chrome/browser/sync_file_system',
+ },
+ 'includes': [ '../build/protoc.gypi' ]
+ },
+ {
+ # Protobuf compiler / generator for Sync FileSystem protocol buffer.
+ # GN version: //chrome/browser/sync_file_system/drive_backend:sync_file_system_drive_proto
+ 'target_name': 'sync_file_system_drive_proto',
+ 'type': 'static_library',
+ 'sources': [
+ 'browser/sync_file_system/drive_backend/metadata_database.proto',
+ ],
+ 'variables': {
+ 'proto_in_dir': 'browser/sync_file_system/drive_backend',
+ 'proto_out_dir': 'chrome/browser/sync_file_system/drive_backend',
+ },
+ 'includes': [ '../build/protoc.gypi' ]
+ },
+ ],
+ },],
],
}
« no previous file with comments | « chrome/browser/BUILD.gn ('k') | chrome/chrome_resources.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698