Merge changes from topic "services_serve_interfaces_test" (fb54b74f) · Commits · e / os / android_system_core

init/Android.bp

+18 −5

Original line number	Diff line number	Diff line
		@@ -93,12 +93,16 @@ cc_defaults {
		"libutils",
		],
		bootstrap: true,
		visibility: [":__subpackages__"],
		}

		cc_library_static {
		name: "libinit",
		recovery_available: true,
		defaults: ["init_defaults", "selinux_policy_version"],
		defaults: [
		"init_defaults",
		"selinux_policy_version",
		],
		srcs: [
		"action.cpp",
		"action_manager.cpp",
		@@ -143,7 +147,10 @@ cc_library_static {
		"ueventd_parser.cpp",
		"util.cpp",
		],
		whole_static_libs: ["libcap", "com.android.sysprop.apex"],
		whole_static_libs: [
		"libcap",
		"com.android.sysprop.apex",
		],
		header_libs: ["bootimg_headers"],
		proto: {
		type: "lite",
		@@ -153,7 +160,10 @@ cc_library_static {
		target: {
		recovery: {
		cflags: ["-DRECOVERY"],
		exclude_shared_libs: ["libbinder", "libutils"],
		exclude_shared_libs: [
		"libbinder",
		"libutils",
		],
		},
		},
		}
		@@ -182,7 +192,10 @@ cc_binary {
		target: {
		recovery: {
		cflags: ["-DRECOVERY"],
		exclude_shared_libs: ["libbinder", "libutils"],
		exclude_shared_libs: [
		"libbinder",
		"libutils",
		],
		},
		},
		}
		@@ -283,7 +296,7 @@ cc_binary {
		},
		generated_headers: [
		"generated_stub_builtin_function_map",
		"generated_android_ids"
		"generated_android_ids",
		],
		target: {
		android: {

init/service.cpp

+9 −0

Original line number	Diff line number	Diff line
		@@ -167,6 +167,15 @@ void Service::NotifyStateChange(const std::string& new_state) const {
		property_set(boottime_property, std::to_string(start_ns));
		}
		}

		// init.svc_debug_pid.* properties are only for tests, and should not be used
		// on device for security checks.
		std::string pid_property = "init.svc_debug_pid." + name_;
		if (new_state == "running") {
		property_set(pid_property, std::to_string(pid_));
		} else if (new_state == "stopped") {
		property_set(pid_property, "");
		}
		}

		void Service::KillProcessGroup(int signal) {

init/test_utils/Android.bp

0 → 100644

+27 −0

Original line number	Diff line number	Diff line
		cc_library_static {
		name: "libinit_test_utils",
		cflags: [
		"-Wall",
		"-Wextra",
		"-Wno-unused-parameter",
		"-Werror",
		],
		srcs: [
		"service_utils.cpp",
		],
		shared_libs: [
		"libcutils",
		"liblog",
		"libjsoncpp",
		"libprotobuf-cpp-lite",
		"libhidl-gen-utils",
		],
		whole_static_libs: [
		"libinit",
		"libpropertyinfoparser",
		],
		static_libs: [
		"libbase",
		],
		export_include_dirs: ["include"], // for tests
		}

init/test_utils/include/init-test-utils/service_utils.h

0 → 100644

+32 −0

Original line number	Diff line number	Diff line
		//
		// Copyright (C) 2019 The Android Open Source Project
		//
		// Licensed under the Apache License, Version 2.0 (the "License");
		// you may not use this file except in compliance with the License.
		// You may obtain a copy of the License at
		//
		// http://www.apache.org/licenses/LICENSE-2.0
		//
		// Unless required by applicable law or agreed to in writing, software
		// distributed under the License is distributed on an "AS IS" BASIS,
		// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		// See the License for the specific language governing permissions and
		// limitations under the License.
		//

		#pragma once

		#include <map>
		#include <set>

		#include <android-base/result.h>
		#include <hidl-util/FqInstance.h>

		namespace android {
		namespace init {

		using ServiceInterfacesMap = std::map<std::string, std::set<android::FqInstance>>;
		android::base::Result<ServiceInterfacesMap> GetOnDeviceServiceInterfacesMap();

		} // namespace init
		} // namespace android

init/test_utils/service_utils.cpp

0 → 100644

+63 −0

Original line number	Diff line number	Diff line
		//
		// Copyright (C) 2019 The Android Open Source Project
		//
		// Licensed under the Apache License, Version 2.0 (the "License");
		// you may not use this file except in compliance with the License.
		// You may obtain a copy of the License at
		//
		// http://www.apache.org/licenses/LICENSE-2.0
		//
		// Unless required by applicable law or agreed to in writing, software
		// distributed under the License is distributed on an "AS IS" BASIS,
		// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		// See the License for the specific language governing permissions and
		// limitations under the License.
		//

		#include <string>

		#include <android-base/logging.h>

		#include "../parser.h"
		#include "../service.h"
		#include "../service_list.h"
		#include "../service_parser.h"
		#include "include/init-test-utils/service_utils.h"

		namespace android {
		namespace init {

		android::base::Result<ServiceInterfacesMap> GetOnDeviceServiceInterfacesMap() {
		ServiceList& service_list = ServiceList::GetInstance();
		Parser parser;
		parser.AddSectionParser("service",
		std::make_unique<ServiceParser>(&service_list, nullptr, std::nullopt));
		for (const auto& location : {
		"/init.rc",
		"/system/etc/init",
		"/system_ext/etc/init",
		"/product/etc/init",
		"/odm/etc/init",
		"/vendor/etc/init",
		}) {
		parser.ParseConfig(location);
		}

		ServiceInterfacesMap result;
		for (const auto& service : service_list.services()) {
		// Create an entry for all services, including services that may not
		// have any declared interfaces.
		result[service->name()] = std::set<android::FqInstance>();
		for (const auto& intf : service->interfaces()) {
		android::FqInstance fqInstance;
		if (!fqInstance.setTo(intf)) {
		return android::base::Error() << "Unable to parse interface: '" << intf << "'";
		}
		result[service->name()].insert(fqInstance);
		}
		}
		return result;
		}

		} // namespace init
		} // namespace android