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

Commit c3616364 authored by Alex Vakulenko's avatar Alex Vakulenko Committed by android-build-merger
Browse files

Make init process create PDX sockets for services am: 409c6eec 

am: 546f7c99

Change-Id: Ieb9597a4cea76aa8b190416784ae43e89e008589
parents c1a1de69 546f7c99

libs/vr/libpdx_default_transport/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ cc_binary { 
        "pdx_benchmarks.cpp",

    ],

    shared_libs: [

        "libbase",

        "libchrome",

        "libcutils",

        "liblog",

libs/vr/libpdx_uds/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ cc_library_static { 
        "service_endpoint.cpp",

    ],

    static_libs: [

        "libcutils",

        "libbase",

        "libpdx",

    ],

}

libs/vr/libpdx_uds/channel_event_set.cpp

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ ChannelEventSet::ChannelEventSet() { 
  const int flags = EFD_CLOEXEC | EFD_NONBLOCK;

  LocalHandle epoll_fd, event_fd;



  if (!SetupHandle(epoll_create(1), &epoll_fd, "epoll") ||

  if (!SetupHandle(epoll_create1(EPOLL_CLOEXEC), &epoll_fd, "epoll") ||

      !SetupHandle(eventfd(0, flags), &event_fd, "event")) {

    return;

  }

libs/vr/libpdx_uds/private/uds/service_endpoint.h

+2 −1
Original line number Diff line number Diff line
@@ -107,7 +107,8 @@ class Endpoint : public pdx::Endpoint { 
  };



  // This class must be instantiated using Create() static methods above.

  Endpoint(const std::string& endpoint_path, bool blocking);

  Endpoint(const std::string& endpoint_path, bool blocking,

           bool use_init_socket_fd = true);



  Endpoint(const Endpoint&) = delete;

  void operator=(const Endpoint&) = delete;

libs/vr/libpdx_uds/service_dispatcher.cpp

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ ServiceDispatcher::ServiceDispatcher() { 
    return;

  }



  epoll_fd_.Reset(epoll_create(1));  // Size arg is ignored, but must be > 0.

  epoll_fd_.Reset(epoll_create1(EPOLL_CLOEXEC));

  if (!epoll_fd_) {

    ALOGE("Failed to create epoll fd because: %s\n", strerror(errno));

    return;