Revert of Do a better job at faking simple challenge signatures.

chromeos/chromeos.gyp

 # Copyright (c) 2012 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': {
     'chromium_code': 1,
     # These files lists are shared with the GN build.
     'chromeos_sources': [
       'accelerometer/accelerometer_reader.cc',
@@ skipping 392 matching lines @@
       'attestation/attestation_flow_unittest.cc',
       'audio/audio_devices_pref_handler_impl_unittest.cc',
       'audio/cras_audio_handler_unittest.cc',
       'cert_loader_unittest.cc',
       'cryptohome/homedir_methods_unittest.cc',
       'cryptohome/system_salt_getter_unittest.cc',
       'dbus/blocking_method_caller_unittest.cc',
       'dbus/cras_audio_client_unittest.cc',
       'dbus/cros_disks_client_unittest.cc',
       'dbus/dbus_client_bundle_unittest.cc',
-      'dbus/fake_cryptohome_client_unittest.cc',
       'dbus/fake_easy_unlock_client_unittest.cc',
       'dbus/fake_power_manager_client_unittest.cc',
       'dbus/gsm_sms_client_unittest.cc',
       'dbus/modem_messaging_client_unittest.cc',
       'dbus/power_policy_controller_unittest.cc',
       'dbus/services/cros_dbus_service_unittest.cc',
       'dbus/services/proxy_resolution_service_provider_unittest.cc',
       'dbus/shill_client_unittest_base.cc',
       'dbus/shill_client_unittest_base.h',
       'dbus/shill_device_client_unittest.cc',
@@ skipping 65 matching lines @@
         '../components/components.gyp:signin_core_account_id',
         '../components/prefs/prefs.gyp:prefs',
         '../crypto/crypto.gyp:crypto',
         '../dbus/dbus.gyp:dbus',
         '../google_apis/google_apis.gyp:google_apis',
         '../net/net.gyp:net',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/libxml/libxml.gyp:libxml',
         '../third_party/protobuf/protobuf.gyp:protobuf_lite',
         '../url/url.gyp:url_lib',
-        'attestation_proto',
         'cryptohome_proto',
         'power_manager_proto',
       ],
       'defines': [
         'CHROMEOS_IMPLEMENTATION',
       ],
       'sources': [ '<@(chromeos_sources)' ],
       'conditions': [
         ['target_arch == "arm" or target_arch == "ia32"', {
           'defines': [
@@ skipping 165 matching lines @@
         '../third_party/cros_system_api/dbus/cryptohome/key.proto',
         '../third_party/cros_system_api/dbus/cryptohome/rpc.proto',
       ],
       'variables': {
         'proto_in_dir': '../third_party/cros_system_api/dbus/cryptohome',
         'proto_out_dir': 'chromeos/dbus/cryptohome',
       },
       'includes': ['../build/protoc.gypi'],
     },
     {
-      # GN version: //chromeos:cryptohome_attestation
-      # Protobuf compiler/generator for attestation related protocol buffers.
-      'target_name': 'attestation_proto',
-      'type': 'static_library',
-      'sources': [
-        'dbus/proto/attestation.proto',
-      ],
-      'variables': {
-        'proto_in_dir': 'dbus/proto',
-        'proto_out_dir': 'chromeos/cryptohome',
-      },
-      'includes': ['../build/protoc.gypi'],
-    },
-    {
       # GN version: //chromeos:cryptohome_signkey_proto
       # Protobuf compiler/generator for cryptohome key signing protocol buffer.
       'target_name': 'cryptohome_signkey_proto',
       'type': 'static_library',
       'sources': [
         '../third_party/cros_system_api/dbus/cryptohome/signed_secret.proto',
       ],
       'variables': {
         'proto_in_dir': '../third_party/cros_system_api/dbus/cryptohome',
         'proto_out_dir': 'chromeos/cryptohome',
@@ skipping 14 matching lines @@
             '../build/isolate.gypi',
           ],
           'sources': [
             'chromeos_unittests.isolate',
           ],
         },
       ],
     }],
   ],
 }