Merge "Move Broadcast Radio HAL to a separate binary." into oc-mr1-dev (84289d2c) · Commits · e / os / android_hardware_interfaces

audio/2.0/default/service.cpp

+1 −6

Original line number	Diff line number	Diff line
		@@ -21,8 +21,6 @@
		#include <android/hardware/audio/2.0/IDevicesFactory.h>
		#include <android/hardware/audio/effect/2.0/IEffectsFactory.h>
		#include <android/hardware/soundtrigger/2.0/ISoundTriggerHw.h>
		#include <android/hardware/broadcastradio/1.0/IBroadcastRadioFactory.h>
		#include <android/hardware/broadcastradio/1.1/IBroadcastRadioFactory.h>

		using android::hardware::configureRpcThreadpool;
		using android::hardware::joinRpcThreadpool;
		@@ -32,7 +30,6 @@ using android::hardware::audio::effect::V2_0::IEffectsFactory;
		using android::hardware::audio::V2_0::IDevicesFactory;
		using android::hardware::soundtrigger::V2_0::ISoundTriggerHw;
		using android::hardware::registerPassthroughServiceImplementation;
		using android::hardware::broadcastradio::V1_1::IBroadcastRadioFactory;

		using android::OK;

		@@ -43,11 +40,9 @@ int main(int /* argc /, char /* argv */ []) {
		LOG_ALWAYS_FATAL_IF(status != OK, "Error while registering audio service: %d", status);
		status = registerPassthroughServiceImplementation<IEffectsFactory>();
		LOG_ALWAYS_FATAL_IF(status != OK, "Error while registering audio effects service: %d", status);
		// Soundtrigger and FM radio might be not present.
		// Soundtrigger might be not present.
		status = registerPassthroughServiceImplementation<ISoundTriggerHw>();
		ALOGE_IF(status != OK, "Error while registering soundtrigger service: %d", status);
		status = registerPassthroughServiceImplementation<IBroadcastRadioFactory>();
		ALOGE_IF(status != OK, "Error while registering fm radio service: %d", status);
		joinRpcThreadpool();
		return status;
		}

broadcastradio/1.1/default/Android.bp

+8 −5

Original line number	Diff line number	Diff line
		@@ -14,8 +14,9 @@
		// limitations under the License.
		//

		cc_library_shared {
		name: "android.hardware.broadcastradio@1.1-impl",
		cc_binary {
		name: "android.hardware.broadcastradio@1.1-service",
		init_rc: ["android.hardware.broadcastradio@1.1-service.rc"],
		vendor: true,
		relative_install_path: "hw",
		cflags: [
		@@ -29,16 +30,18 @@ cc_library_shared {
		"Tuner.cpp",
		"VirtualProgram.cpp",
		"VirtualRadio.cpp",
		"service.cpp"
		],
		static_libs: [
		"android.hardware.broadcastradio@1.1-utils-lib",
		],
		shared_libs: [
		"android.hardware.broadcastradio@1.0",
		"android.hardware.broadcastradio@1.1",
		"libbase",
		"libhidlbase",
		"libhidltransport",
		"libutils",
		"liblog",
		"android.hardware.broadcastradio@1.0",
		"android.hardware.broadcastradio@1.1",
		"libutils",
		],
		}

broadcastradio/1.1/default/android.hardware.broadcastradio@1.1-service.rc

0 → 100644

+4 −0

Original line number	Diff line number	Diff line
		service broadcastradio-hal /vendor/bin/hw/android.hardware.broadcastradio@1.1-service
		class hal
		user audioserver
		group audio

broadcastradio/1.1/default/service.cpp

0 → 100644

+36 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2017 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.
		*/
		#define LOG_TAG "BroadcastRadioDefault.service"

		#include <android-base/logging.h>
		#include <hidl/HidlTransportSupport.h>

		#include "BroadcastRadioFactory.h"

		using android::hardware::configureRpcThreadpool;
		using android::hardware::joinRpcThreadpool;
		using android::hardware::broadcastradio::V1_1::implementation::BroadcastRadioFactory;

		int main(int /* argc /, char* /* argv */) {
		configureRpcThreadpool(4, true);

		BroadcastRadioFactory broadcastRadioFactory;
		auto status = broadcastRadioFactory.registerAsService();
		CHECK_EQ(status, android::OK) << "Failed to register Broadcast Radio HAL implementation";

		joinRpcThreadpool();
		return 1; // joinRpcThreadpool shouldn't exit
		}