Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ad76e9f authored by Arman Uguray's avatar Arman Uguray
Browse files

Revert "service: Move UNIX IPC code into ipc/unix/" 

It turns out "unix" is defined to be 1 somewhere, which breaks compilation of this CL (since I added "namespace unix").

This reverts commit 13e49c60.

Change-Id: I00b0a59a35024ccf78297117916d12031a6346a5
parent 3cc1ef97

system/service/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -25,9 +25,9 @@ btserviceCommonSrc := \ 
	gatt_server.cpp \

	hal/bluetooth_interface.cpp \

	ipc/ipc_handler.cpp \

	ipc/ipc_handler_unix.cpp \

	ipc/ipc_manager.cpp \

	ipc/unix/ipc_handler_unix.cpp \

	ipc/unix/unix_ipc_host.cpp \

	ipc/unix_ipc_host.cpp \

	logging_helpers.cpp \

	settings.cpp \

	util/atomic_string.cpp \

system/service/ipc/binder/ipc_handler_binder.cpp

+0 −2
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ using android::status_t; 
using android::String16;



namespace ipc {

namespace binder {



IPCHandlerBinder::IPCHandlerBinder(

    bluetooth::Adapter* adapter,
@@ -80,5 +79,4 @@ void IPCHandlerBinder::NotifyStarted() { 
    delegate()->OnIPCHandlerStarted(IPCManager::TYPE_BINDER);

}



}  // namespace binder

}  // namespace ipc

system/service/ipc/binder/ipc_handler_binder.h

+0 −2
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
#include "service/ipc/ipc_manager.h"



namespace ipc {

namespace binder {



// Implements a Binder based IPCHandler.

class IPCHandlerBinder : public IPCHandler {
@@ -44,5 +43,4 @@ class IPCHandlerBinder : public IPCHandler { 
  DISALLOW_COPY_AND_ASSIGN(IPCHandlerBinder);

};



}  // namespace binder

}  // namespace ipc

system/service/ipc/unix/ipc_handler_unix.cpp→system/service/ipc/ipc_handler_unix.cpp

+2 −4
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
//  limitations under the License.

//



#include "service/ipc/unix/ipc_handler_unix.h"

#include "service/ipc/ipc_handler_unix.h"



#include <sys/socket.h>

#include <sys/un.h>
@@ -23,11 +23,10 @@ 


#include "osi/include/socket_utils/sockets.h"

#include "service/daemon.h"

#include "service/ipc/unix/unix_ipc_host.h"

#include "service/ipc/unix_ipc_host.h"

#include "service/settings.h"



namespace ipc {

namespace unix {



IPCHandlerUnix::IPCHandlerUnix(bluetooth::Adapter* adapter,

                               IPCManager::Delegate* delegate)
@@ -213,5 +212,4 @@ void IPCHandlerUnix::NotifyStoppedOnCurrentThread() { 
    delegate()->OnIPCHandlerStopped(IPCManager::TYPE_UNIX);

}



}  // namespace unix

}  // namespace ipc

system/service/ipc/unix/ipc_handler_unix.h→system/service/ipc/ipc_handler_unix.h

+0 −2
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ class SingleThreadTaskRunner; 
}  // namespace base



namespace ipc {

namespace unix {



// Implements a UNIX domain-socket based IPCHandler

class IPCHandlerUnix : public IPCHandler {
@@ -84,5 +83,4 @@ class IPCHandlerUnix : public IPCHandler { 
  DISALLOW_COPY_AND_ASSIGN(IPCHandlerUnix);

};



}  // namespace unix

}  // namespace ipc