Commit cc5b3be4 authored by thestig@chromium.org's avatar thestig@chromium.org

Mark some files/targets as compiled only when their associated feature is enabled.

Review URL: https://codereview.chromium.org/472213002

Cr-Commit-Position: refs/heads/master@{#290046}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290046 0039d316-1c4b-4281-b951-d872f2087c98
parent 8030b05d
...@@ -35,8 +35,6 @@ group("extra_resources") { ...@@ -35,8 +35,6 @@ group("extra_resources") {
deps += [ deps += [
"//chrome/browser/resources:component_extension_resources", "//chrome/browser/resources:component_extension_resources",
"//chrome/browser/resources:options_resources", "//chrome/browser/resources:options_resources",
"//chrome/browser/resources:quota_internals_resources",
"//chrome/browser/resources:sync_file_system_internals_resources",
] ]
} }
...@@ -49,6 +47,13 @@ group("extra_resources") { ...@@ -49,6 +47,13 @@ group("extra_resources") {
#'browser/resources/chromeos/chromevox/chromevox.gyp:chromevox', TODO(GYP) #'browser/resources/chromeos/chromevox/chromevox.gyp:chromevox', TODO(GYP)
] ]
} }
if (enable_extensions) {
deps += [
"//chrome/browser/resources:quota_internals_resources",
"//chrome/browser/resources:sync_file_system_internals_resources",
]
}
} }
# GYP version: chrome/chrome_resources.gyp:chrome_strings # GYP version: chrome/chrome_resources.gyp:chrome_strings
......
...@@ -138,8 +138,6 @@ static_library("browser") { ...@@ -138,8 +138,6 @@ static_library("browser") {
deps += [ deps += [
"//cc", "//cc",
"//chrome/browser/performance_monitor", "//chrome/browser/performance_monitor",
"//chrome/browser/sync_file_system:sync_file_system_proto",
"//chrome/browser/sync_file_system/drive_backend:sync_file_system_drive_proto",
"//chrome/common/extensions/api:api", "//chrome/common/extensions/api:api",
"//components/autofill/content/browser", "//components/autofill/content/browser",
"//components/dom_distiller/content", "//components/dom_distiller/content",
...@@ -233,7 +231,11 @@ static_library("browser") { ...@@ -233,7 +231,11 @@ static_library("browser") {
] ]
} }
if (enable_extensions) { if (enable_extensions) {
deps += [ "//chrome/browser/extensions" ] deps += [
"//chrome/browser/extensions",
"//chrome/browser/sync_file_system:sync_file_system_proto",
"//chrome/browser/sync_file_system/drive_backend:sync_file_system_drive_proto",
]
sources += rebase_path(gypi_values.chrome_browser_extensions_sources, sources += rebase_path(gypi_values.chrome_browser_extensions_sources,
".", "//chrome") ".", "//chrome")
} }
......
...@@ -706,9 +706,6 @@ ...@@ -706,9 +706,6 @@
# TODO(brettw) should this go with the webrtc sources? # TODO(brettw) should this go with the webrtc sources?
'browser/media/webrtc_log_list.cc', 'browser/media/webrtc_log_list.cc',
'browser/media/webrtc_log_list.h', '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.cc',
'browser/memory_details.h', 'browser/memory_details.h',
'browser/memory_details_android.cc', 'browser/memory_details_android.cc',
...@@ -1912,8 +1909,6 @@ ...@@ -1912,8 +1909,6 @@
], ],
# Used both when enable_printing == 1 (full) and == 2 (basic) # Used both when enable_printing == 1 (full) and == 2 (basic)
'chrome_browser_basic_printing_sources': [ '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.cc',
'browser/printing/print_job.h', 'browser/printing/print_job.h',
'browser/printing/print_job_manager.cc', 'browser/printing/print_job_manager.cc',
...@@ -1942,6 +1937,8 @@ ...@@ -1942,6 +1937,8 @@
'browser/printing/cloud_print/cloud_print_proxy_service_factory.cc', '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_factory.h',
'browser/printing/cloud_print/cloud_print_proxy_service.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.h',
'browser/printing/printer_manager_dialog_linux.cc', 'browser/printing/printer_manager_dialog_linux.cc',
'browser/printing/printer_manager_dialog_mac.mm', 'browser/printing/printer_manager_dialog_mac.mm',
...@@ -2130,6 +2127,9 @@ ...@@ -2130,6 +2127,9 @@
'browser/media_galleries/fileapi/supported_audio_video_checker.h', '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.cc',
'browser/media_galleries/fileapi/supported_image_type_validator.h', '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.cc',
'browser/media_galleries/imported_media_gallery_registry.h', 'browser/media_galleries/imported_media_gallery_registry.h',
'browser/media_galleries/linux/mtp_device_delegate_impl_linux.cc', 'browser/media_galleries/linux/mtp_device_delegate_impl_linux.cc',
...@@ -3520,34 +3520,6 @@ ...@@ -3520,34 +3520,6 @@
}, },
'includes': [ '../build/protoc.gypi' ] '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': [ 'conditions': [
['OS=="android"', { ['OS=="android"', {
...@@ -3634,7 +3606,38 @@ ...@@ -3634,7 +3606,38 @@
'includes': [ '../build/android/java_cpp_template.gypi' ], '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' ]
},
],
},],
], ],
} }
...@@ -99,22 +99,6 @@ ...@@ -99,22 +99,6 @@
}, },
'includes': [ '../build/grit_action.gypi' ], 'includes': [ '../build/grit_action.gypi' ],
}, },
{
# GN version: //chrome/browser/resources:quota_internals_resources
'action_name': 'generate_quota_internals_resources',
'variables': {
'grit_grd_file': 'browser/resources/quota_internals_resources.grd',
},
'includes': [ '../build/grit_action.gypi' ],
},
{
# GN version: //chrome/browser/resources:sync_file_system_internals_resources
'action_name': 'generate_sync_file_system_internals_resources',
'variables': {
'grit_grd_file': 'browser/resources/sync_file_system_internals_resources.grd',
},
'includes': [ '../build/grit_action.gypi' ],
},
], ],
'copies': [ 'copies': [
{ {
...@@ -140,6 +124,26 @@ ...@@ -140,6 +124,26 @@
}], }],
], ],
}], }],
['enable_extensions==1', {
'actions': [
{
# GN version: //chrome/browser/resources:quota_internals_resources
'action_name': 'generate_quota_internals_resources',
'variables': {
'grit_grd_file': 'browser/resources/quota_internals_resources.grd',
},
'includes': [ '../build/grit_action.gypi' ],
},
{
# GN version: //chrome/browser/resources:sync_file_system_internals_resources
'action_name': 'generate_sync_file_system_internals_resources',
'variables': {
'grit_grd_file': 'browser/resources/sync_file_system_internals_resources.grd',
},
'includes': [ '../build/grit_action.gypi' ],
},
],
}],
], ],
}, },
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment