Revert 284508 "GN chrome/common build, rename enable_printing."

trunk/src/chrome/chrome_common.gypi

 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
-    # File lists shared with GN build.
     'chrome_common_sources': [
       '../apps/app_shim/app_shim_launch.h',
       '../apps/app_shim/app_shim_messages.h',
       'common/all_messages.h',
       'common/attrition_experiments.h',
       'common/auto_start_linux.cc',
       'common/auto_start_linux.h',
       'common/badge_util.cc',
       'common/badge_util.h',
       'common/child_process_logging.h',
@@ skipping 101 matching lines @@
       'common/extensions/permissions/chrome_permission_message_provider.cc',
       'common/extensions/permissions/chrome_permission_message_provider.h',
       'common/extensions/sync_helper.cc',
       'common/extensions/sync_helper.h',
       'common/extensions/update_manifest.cc',
       'common/extensions/update_manifest.h',
       'common/favicon/favicon_url_parser.cc',
       'common/favicon/favicon_url_parser.h',
       'common/icon_with_badge_image_source.cc',
       'common/icon_with_badge_image_source.h',
+      'common/importer/firefox_importer_utils.cc',
+      'common/importer/firefox_importer_utils.h',
+      'common/importer/firefox_importer_utils_linux.cc',
+      'common/importer/firefox_importer_utils_mac.mm',
+      'common/importer/firefox_importer_utils_win.cc',
+      'common/importer/ie_importer_test_registry_overrider_win.cc',
+      'common/importer/ie_importer_test_registry_overrider_win.h',
+      'common/importer/ie_importer_utils_win.cc',
+      'common/importer/ie_importer_utils_win.h',
+      'common/importer/imported_bookmark_entry.cc',
+      'common/importer/imported_bookmark_entry.h',
+      'common/importer/imported_favicon_usage.cc',
+      'common/importer/imported_favicon_usage.h',
+      'common/importer/importer_bridge.cc',
+      'common/importer/importer_bridge.h',
+      'common/importer/importer_data_types.cc',
+      'common/importer/importer_data_types.h',
+      'common/importer/importer_type.h',
+      'common/importer/importer_url_row.cc',
+      'common/importer/importer_url_row.h',
+      'common/importer/profile_import_process_messages.cc',
+      'common/importer/profile_import_process_messages.h',
+      'common/importer/safari_importer_utils.h',
+      'common/importer/safari_importer_utils.mm',
       'common/instant_restricted_id_cache.h',
       'common/instant_types.cc',
       'common/instant_types.h',
       'common/localized_error.cc',
       'common/localized_error.h',
       'common/logging_chrome.cc',
       'common/logging_chrome.h',
       'common/mac/app_mode_common.h',
       'common/mac/app_mode_common.mm',
       'common/mac/cfbundle_blocker.h',
@@ skipping 27 matching lines @@
       'common/profiling.cc',
       'common/profiling.h',
       'common/ref_counted_util.h',
       'common/render_messages.cc',
       'common/render_messages.h',
       'common/safe_browsing/safebrowsing_messages.h',
       'common/search_provider.h',
       'common/search_types.h',
       'common/search_urls.cc',
       'common/search_urls.h',
+      'common/service_messages.h',
+      'common/service_process_util.cc',
+      'common/service_process_util.h',
+      'common/service_process_util_linux.cc',
+      'common/service_process_util_mac.mm',
+      'common/service_process_util_posix.cc',
+      'common/service_process_util_posix.h',
+      'common/service_process_util_win.cc',
       'common/spellcheck_common.cc',
       'common/spellcheck_common.h',
       'common/spellcheck_marker.h',
       'common/spellcheck_messages.h',
       'common/spellcheck_result.h',
       'common/switch_utils.cc',
       'common/switch_utils.h',
       'common/tts_messages.h',
       'common/tts_utterance_request.cc',
       'common/tts_utterance_request.h',
@@ skipping 41 matching lines @@
       'common/extensions/api/url_handlers/url_handlers_parser.h',
       'common/extensions/api/webstore/webstore_api_constants.cc',
       'common/extensions/api/webstore/webstore_api_constants.h',
     ],
     'chrome_common_full_safe_browsing_sources': [
       'common/safe_browsing/download_protection_util.cc',
       'common/safe_browsing/download_protection_util.h',
       'common/safe_browsing/zip_analyzer.cc',
       'common/safe_browsing/zip_analyzer.h',
     ],
-    'chrome_common_importer_sources': [
-      'common/importer/firefox_importer_utils.cc',
-      'common/importer/firefox_importer_utils.h',
-      'common/importer/firefox_importer_utils_linux.cc',
-      'common/importer/firefox_importer_utils_mac.mm',
-      'common/importer/firefox_importer_utils_win.cc',
-      'common/importer/ie_importer_test_registry_overrider_win.cc',
-      'common/importer/ie_importer_test_registry_overrider_win.h',
-      'common/importer/ie_importer_utils_win.cc',
-      'common/importer/ie_importer_utils_win.h',
-      'common/importer/imported_bookmark_entry.cc',
-      'common/importer/imported_bookmark_entry.h',
-      'common/importer/imported_favicon_usage.cc',
-      'common/importer/imported_favicon_usage.h',
-      'common/importer/importer_bridge.cc',
-      'common/importer/importer_bridge.h',
-      'common/importer/importer_data_types.cc',
-      'common/importer/importer_data_types.h',
-      'common/importer/importer_type.h',
-      'common/importer/importer_url_row.cc',
-      'common/importer/importer_url_row.h',
-      'common/importer/profile_import_process_messages.cc',
-      'common/importer/profile_import_process_messages.h',
-      'common/importer/safari_importer_utils.h',
-      'common/importer/safari_importer_utils.mm',
-    ],
-    'chrome_common_service_process_sources': [
-      'common/service_messages.h',
-      'common/service_process_util.cc',
-      'common/service_process_util.h',
-      'common/service_process_util_linux.cc',
-      'common/service_process_util_mac.mm',
-      'common/service_process_util_posix.cc',
-      'common/service_process_util_posix.h',
-      'common/service_process_util_win.cc',
-    ],
-    'chrome_common_win_mac_sources': [
-      'common/extensions/api/networking_private/networking_private_crypto_nss.cc',
-      'common/extensions/api/networking_private/networking_private_crypto_openssl.cc',
-      'common/extensions/api/networking_private/networking_private_crypto.h',
-      'common/media_galleries/itunes_library.cc',
-      'common/media_galleries/itunes_library.h',
-      'common/media_galleries/picasa_types.cc',
-      'common/media_galleries/picasa_types.h',
-      'common/media_galleries/pmp_constants.h',
-    ],
-    'chrome_common_mac_sources': [
-      'common/media_galleries/iphoto_library.cc',
-      'common/media_galleries/iphoto_library.h',
-    ]
   },
   'targets': [
     {
       'target_name': 'common',
       'type': 'static_library',
       'variables': {
         'chrome_common_target': 1,
         'enable_wexit_time_destructors': 1,
       },
       'include_dirs': [
@@ skipping 42 matching lines @@
         '<(DEPTH)/third_party/zlib/google/zip.gyp:zip',
         '<(DEPTH)/ui/gfx/ipc/gfx_ipc.gyp:gfx_ipc',
         '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
         '<(DEPTH)/url/url.gyp:url_lib',
       ],
       'sources': [
         '<@(chrome_common_sources)'
       ],
       'conditions': [
         ['enable_extensions==1', {
-          'sources': [ '<@(chrome_common_extensions_sources)' ],
+          'sources': [
+            '<@(chrome_common_extensions_sources)',
+          ],
           'dependencies': [
             '../device/bluetooth/bluetooth.gyp:device_bluetooth',
             '../device/usb/usb.gyp:device_usb',
           ],
         }],
         ['OS=="win" or OS=="mac"', {
-          'sources': [ '<@(chrome_common_win_mac_sources)' ],
+          'sources': [
+            'common/extensions/api/networking_private/networking_private_crypto_nss.cc',
+            'common/extensions/api/networking_private/networking_private_crypto_openssl.cc',
+            'common/extensions/api/networking_private/networking_private_crypto.h',
+            'common/media_galleries/itunes_library.cc',
+            'common/media_galleries/itunes_library.h',
+            'common/media_galleries/picasa_types.cc',
+            'common/media_galleries/picasa_types.h',
+            'common/media_galleries/pmp_constants.h',
+          ],
         }],
         ['OS=="mac"', {
-          'sources': [ '<@(chrome_common_mac_sources)' ],
+          'sources': [
+            'common/media_galleries/iphoto_library.cc',
+            'common/media_galleries/iphoto_library.h',
+          ],
         }],
         ['OS != "ios"', {
           'dependencies': [
             '<(DEPTH)/chrome/common/extensions/api/api.gyp:chrome_api',
             '<(DEPTH)/components/components.gyp:autofill_core_common',
             '<(DEPTH)/components/components.gyp:autofill_content_common',
             '<(DEPTH)/components/components.gyp:password_manager_core_common',
             '<(DEPTH)/components/components.gyp:signin_core_common',
             '<(DEPTH)/components/components.gyp:translate_content_common',
             '<(DEPTH)/components/components.gyp:visitedlink_common',
@@ skipping 50 matching lines @@
         ['enable_printing==0', {
           'sources!': [
             'common/print_messages.cc',
             'common/print_messages.h',
           ]
         }, {
           'dependencies': [
             '<(DEPTH)/printing/printing.gyp:printing',
           ],
         }],
-        ['enable_printing==1', {
-          'sources': [ '<@(chrome_common_service_process_sources)' ],
+        ['enable_printing!=1', {
+          'sources!' : [
+            'common/service_messages.h',
+          ],
+          'sources/': [
+            ['exclude', '^common/service_process_util_'],
+          ],
         }],
         ['enable_service_discovery==1', {
           'sources' : [
             'common/local_discovery/service_discovery_client.cc',
             'common/local_discovery/service_discovery_client.h',
            ]
         }],
         ['enable_mdns==1', {
           'sources' : [
             'common/local_discovery/service_discovery_client_impl.cc',
             'common/local_discovery/service_discovery_client_impl.h',
           ]
         }],
         ['OS=="android"', {
+          'sources/': [
+            ['exclude', '^common/importer/'],
+            ['exclude', '^common/media_galleries/'],
+            ['exclude', '^common/service_'],
+          ],
           'sources!': [
             'common/badge_util.cc',
             'common/chrome_version_info_posix.cc',
             'common/extensions/api/extension_action/browser_action_handler.cc',
             'common/extensions/api/extension_action/page_action_handler.cc',
             'common/extensions/api/spellcheck/spellcheck_handler.cc',
             'common/extensions/manifest_handlers/minimum_chrome_version_checker.cc',
             'common/icon_with_badge_image_source.cc',
-            'common/media_galleries/metadata_types.h',
             'common/net/url_util.cc',
             'common/spellcheck_common.cc',
           ],
-        }, {
-          # Non-Android.
-          'sources': [ '<@(chrome_common_importer_sources)' ]
         }],
         ['OS=="win"', {
           'include_dirs': [
             '<(DEPTH)/breakpad/src',
             '<(DEPTH)/third_party/wtl/include',
           ],
         }],
         ['enable_mdns == 1', {
             'sources': [
               'common/local_discovery/local_discovery_messages.h',
@@ skipping 16 matching lines @@
             'common/child_process_logging_posix.cc',
             'common/chrome_version_info_posix.cc',
           ],
         }],
         ['remoting==1', {
           'dependencies': [
             '../remoting/remoting.gyp:remoting_client_plugin',
           ],
         }],
         ['enable_plugins==0', {
-          'sources!' : [
+          'source!' : [
             'common/pepper_permission_util.cc',
           ],
         }],
         ['enable_webrtc==0', {
           'sources!': [
             'common/media/webrtc_logging_messages.h',
           ]
         }],
         ['configuration_policy==1', {
           'dependencies': [
@@ skipping 26 matching lines @@
             # by file name rules).
             ['include', '^common/chrome_version_info_mac\\.mm$'],
           ],
         }],
       ],
       'export_dependent_settings': [
         '../base/base.gyp:base',
       ],
     },
     {
-      # GN version: //chrome/common:version
       'target_name': 'common_version',
       'type': 'none',
       'conditions': [
         ['os_posix == 1 and OS != "mac" and OS != "ios"', {
           'direct_dependent_settings': {
             'include_dirs': [
               '<(SHARED_INTERMEDIATE_DIR)',
             ],
           },
           # Because posix_version generates a header, we must set the
@@ skipping 39 matching lines @@
                 '<(template_input_path)',
                 '<@(_outputs)',
               ],
               'message': 'Generating version information',
             },
           ],
         }],
       ],
     },
     {
-      # GN version: //chrome/common/net
+      # GN version: //chrome/common/net:net
       'target_name': 'common_net',
       'type': 'static_library',
       'sources': [
         'common/net/net_error_info.cc',
         'common/net/net_error_info.h',
         'common/net/net_resource_provider.cc',
         'common/net/net_resource_provider.h',
         'common/net/predictor_common.h',
         'common/net/url_util.cc',
         'common/net/url_util.h',
@@ skipping 77 matching lines @@
         'common/safe_browsing/csd.proto'
       ],
       'variables': {
         'proto_in_dir': 'common/safe_browsing',
         'proto_out_dir': 'chrome/common/safe_browsing',
       },
       'includes': [ '../build/protoc.gypi' ],
     },
   ],
 }