Revert of Build services as standalone executables

services/catalog/reader.cc

 // Copyright 2016 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.
 
 #include "services/catalog/reader.h"
 
 #include "base/bind.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_util.h"
 #include "base/json/json_file_value_serializer.h"
@@ skipping 16 matching lines @@
                                const std::string& package_name_override) {
   // TODO(beng): think more about how this should be done for exe targets.
   std::string package_name =
       package_name_override.empty() ? name : package_name_override;
   return package_dir.AppendASCII(kPackagesDirName).AppendASCII(
       package_name + "/manifest.json");
 }
 
 base::FilePath GetExecutablePath(const base::FilePath& package_dir,
                                  const std::string& name) {
-  return package_dir.AppendASCII(name + "/" + name + ".service");
+  return package_dir.AppendASCII(name + "/" + name + ".library");
 }
 
 std::unique_ptr<Entry> ProcessManifest(
     std::unique_ptr<base::Value> manifest_root,
     const base::FilePath& package_dir) {
   // Manifest was malformed or did not exist.
   if (!manifest_root)
     return nullptr;
 
   const base::DictionaryValue* dictionary = nullptr;
@@ skipping 180 matching lines @@
     std::unique_ptr<Entry> entry) {
   if (!entry)
     return;
   service_manager::mojom::ResolveResultPtr result =
       service_manager::mojom::ResolveResult::From(*entry);
   AddEntryToCache(cache, std::move(entry));
   entry_created_callback.Run(std::move(result));
 }
 
 }  // namespace catalog