Merge "Drops unittest build on Mac host." (d735c95b) · Commits · e / os / android_packages_modules_Bluetooth

system/osi/Android.bp

+16 −1

Original line number	Diff line number	Diff line
		@@ -21,6 +21,11 @@ cc_test_library {
		host_supported: true,
		shared: {
		enabled: false
		},
		target: {
		darwin: {
		enabled: false
		}
		}
		}

		@@ -33,6 +38,11 @@ cc_test_library {
		host_supported: true,
		shared: {
		enabled: false
		},
		target: {
		darwin: {
		enabled: false
		}
		}
		}

		@@ -45,7 +55,12 @@ cc_library_static {
		proto: {
		export_proto_headers: true,
		},
		host_supported: true
		host_supported: true,
		target: {
		darwin: {
		enabled: false
		}
		}
		}

system/service/Android.bp

+1 −3

Original line number	Diff line number	Diff line
		@@ -133,9 +133,7 @@ cc_test {
		],
		},
		darwin: {
		srcs: [
		"test/stub_ipc_handler_linux.cc",
		],
		enabled: false,
		},
		linux_glibc: {
		srcs: btserviceLinuxSrc + [

system/service/common/Android.bp

+5 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,11 @@ cc_library_static {
		shared_libs: [
		"libbase",
		],
		target: {
		darwin: {
		enabled: false
		}
		}
		}

		// Bluetooth Binder shared library

system/service/test/stub_ipc_handler_linux.cc

deleted100644 → 0

+0 −71

Original line number	Diff line number	Diff line
		//
		// Copyright 2015 Google, Inc.
		//
		// 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 "service/ipc/ipc_handler_linux.h"

		// TODO(keybuk): This is a crappy workaround to link IPCHandlerLinux into
		// host-native unit tests. IPCManager shouldn't explicitly reference these
		// classes.

		namespace ipc {

		IPCHandlerLinux::IPCHandlerLinux(bluetooth::Adapter* adapter,
		IPCManager::Delegate* delegate)
		: IPCHandler(adapter, delegate),
		running_(false),
		thread_("IPCHandlerLinux"),
		keep_running_(true) {
		// Stub
		}

		IPCHandlerLinux::~IPCHandlerLinux() {
		// Stub
		}

		bool IPCHandlerLinux::Run() {
		// Stub
		return false;
		}

		void IPCHandlerLinux::Stop() {
		// Stub
		}

		void IPCHandlerLinux::StartListeningOnThread() {
		// Stub
		}

		void IPCHandlerLinux::ShutDownOnOriginThread() {
		// Stub
		}

		void IPCHandlerLinux::NotifyStartedOnOriginThread() {
		// Stub
		}

		void IPCHandlerLinux::NotifyStartedOnCurrentThread() {
		// Stub
		}

		void IPCHandlerLinux::NotifyStoppedOnOriginThread() {
		// Stub
		}

		void IPCHandlerLinux::NotifyStoppedOnCurrentThread() {
		// Stub
		}

		} // namespace

system/types/Android.bp

+10 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,11 @@ cc_library_static {
		],
		header_libs: ["libbluetooth-types-header"],
		export_header_lib_headers: ["libbluetooth-types-header"],
		target: {
		darwin: {
		enabled: false
		}
		}
		}

		// ========================================================
		@@ -33,4 +38,9 @@ cc_test {
		"test/raw_address_unittest.cc",
		"test/bluetooth/uuid_unittest.cc",
		],
		target: {
		darwin: {
		enabled: false
		}
		}
		}