Merge "Fastboot AIDL additional changes" (f4756ff0) · Commits · e / os / android_hardware_interfaces

fastboot/aidl/default/Android.bp

+7 −3

Original line number	Diff line number	Diff line
		@@ -22,16 +22,20 @@ package {
		default_applicable_licenses: ["hardware_interfaces_license"],
		}

		cc_library {
		name: "android.hardware.fastboot-impl-mock",
		recovery: true,
		cc_binary {
		name: "android.hardware.fastboot-service.example_recovery",
		init_rc: ["android.hardware.fastboot-service.example_recovery.rc"],
		vintf_fragments: ["android.hardware.fastboot-service.example.xml"],
		recovery_available: true,
		srcs: [
		"Fastboot.cpp",
		"main.cpp",
		],
		relative_install_path: "hw",
		shared_libs: [
		"libbase",
		"libbinder_ndk",
		"liblog",
		"libutils",
		"libcutils",
		"android.hardware.fastboot-V1-ndk",

fastboot/aidl/default/android.hardware.fastboot-service.example.xml

0 → 100644

+8 −0

Original line number	Diff line number	Diff line
		<manifest version="1.0" type="device">
		<hal format="aidl">
		<name>android.hardware.fastboot</name>
		<version>1</version>
		<fqname>IFastboot/default</fqname>
		</hal>
		</manifest>

fastboot/aidl/default/android.hardware.fastboot-service.example_recovery.rc

0 → 100644

+6 −0

Original line number	Diff line number	Diff line
		service vendor.fastboot-default /system/bin/hw/android.hardware.fastboot-service.example_recovery
		class hal
		seclabel u:r:hal_fastboot_default:s0
		user system
		group system
		interface aidl android.hardware.fastboot.IFastboot/default

fastboot/aidl/default/main.cpp

0 → 100644

+38 −0

Original line number	Diff line number	Diff line

		/*
		* Copyright (C) 2022 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 <android-base/logging.h>
		#include <android/binder_manager.h>
		#include <android/binder_process.h>
		#include "Fastboot.h"

		using aidl::android::hardware::fastboot::Fastboot;
		using aidl::android::hardware::fastboot::IFastboot;

		int main(int, char* argv[]) {
		android::base::InitLogging(argv, android::base::KernelLogger);
		ABinderProcess_setThreadPoolMaxThreadCount(0);
		std::shared_ptr<IFastboot> service = ndk::SharedRefBase::make<Fastboot>();

		const std::string instance = std::string(IFastboot::descriptor) + "/default";
		auto status = AServiceManager_addService(service->asBinder().get(), instance.c_str());
		CHECK_EQ(status, STATUS_OK) << "Failed to add service " << instance << " " << status;
		LOG(INFO) << "IFastboot AIDL service running...";

		ABinderProcess_joinThreadPool();
		return EXIT_FAILURE; // should not reach
		}

fastboot/aidl/fastbootshim/Android.bp

0 → 100644

+61 −0

Original line number	Diff line number	Diff line
		// Copyright (C) 2022 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.

		package {
		// See: http://go/android-license-faq
		// A large-scale-change added 'default_applicable_licenses' to import
		// all of the 'license_kinds' from "hardware_interfaces_license"
		// to get the below license kinds:
		// SPDX-license-identifier-Apache-2.0
		default_applicable_licenses: ["hardware_interfaces_license"],
		}

		cc_defaults {
		name: "libfastbootshim_defaults",
		target: {
		darwin: {
		enabled: false,
		},
		},
		cflags: [
		"-Wall",
		"-Werror",
		],
		static_libs: [
		"android.hardware.fastboot-V1-ndk",
		"android.hardware.fastboot@1.0",
		"android.hardware.fastboot@1.1",
		],
		shared_libs: [
		"libbase",
		"libbinder_ndk",
		"libcutils",
		"libhidlbase",
		"liblog",
		"libutils",
		],
		}

		// Shim library that wraps a HIDL Fastboot object into an AIDL Fastboot object.
		cc_library_static {
		name: "libfastbootshim",
		defaults: ["libfastbootshim_defaults"],
		recovery_available: true,
		srcs: [
		"fastbootshim.cpp",
		],
		export_include_dirs: [
		"include",
		],
		}