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

Commit 4fe60582 authored by Alex Vakulenko's avatar Alex Vakulenko
Browse files

Remove references to libchrome 

Removed dependencies on libchrome which was used mostly for logging
and switched over to standard Android log macros.

Bug: None
Test: `m -j32` still succeeds
Change-Id: I0a841c19c15c02f9a031af200e82837f9450d88a
parent 2dcb6983

libs/vr/libbufferhub/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ includeFiles := \ 
	$(LOCAL_PATH)/include



staticLibraries := \

	libchrome \

	libdvrcommon \

	libpdx_default_transport \

libs/vr/libbufferhub/buffer_hub_client.cpp

+1 −1
Original line number Diff line number Diff line 
#include <private/dvr/buffer_hub_client.h>



#include <cutils/log.h>

#include <log/log.h>

#include <poll.h>

#define ATRACE_TAG ATRACE_TAG_GRAPHICS

#include <utils/Trace.h>

libs/vr/libbufferhub/bufferhub_tests.cpp

+20 −12
Original line number Diff line number Diff line 
#include <android/native_window.h>

#include <base/posix/eintr_wrapper.h>

#include <gtest/gtest.h>

#include <private/dvr/buffer_hub_client.h>



#include <mutex>

#include <thread>



#define RETRY_EINTR(fnc_call)                 \

  ([&]() -> decltype(fnc_call) {              \

    decltype(fnc_call) result;                \

    do {                                      \

      result = (fnc_call);                    \

    } while (result == -1 && errno == EINTR); \

    return result;                            \

  })()



using android::dvr::BufferProducer;

using android::dvr::BufferConsumer;

using android::pdx::LocalHandle;
@@ -32,27 +40,27 @@ TEST_F(LibBufferHubTest, TestBasicUsage) { 


  EXPECT_EQ(0, p->Post(LocalHandle(), kContext));

  // Both consumers should be triggered.

  EXPECT_GE(0, HANDLE_EINTR(p->Poll(0)));

  EXPECT_LT(0, HANDLE_EINTR(c->Poll(10)));

  EXPECT_LT(0, HANDLE_EINTR(c2->Poll(10)));

  EXPECT_GE(0, RETRY_EINTR(p->Poll(0)));

  EXPECT_LT(0, RETRY_EINTR(c->Poll(10)));

  EXPECT_LT(0, RETRY_EINTR(c2->Poll(10)));



  uint64_t context;

  LocalHandle fence;

  EXPECT_LE(0, c->Acquire(&fence, &context));

  EXPECT_EQ(kContext, context);

  EXPECT_GE(0, HANDLE_EINTR(c->Poll(0)));

  EXPECT_GE(0, RETRY_EINTR(c->Poll(0)));



  EXPECT_LE(0, c2->Acquire(&fence, &context));

  EXPECT_EQ(kContext, context);

  EXPECT_GE(0, HANDLE_EINTR(c2->Poll(0)));

  EXPECT_GE(0, RETRY_EINTR(c2->Poll(0)));



  EXPECT_EQ(0, c->Release(LocalHandle()));

  EXPECT_GE(0, HANDLE_EINTR(p->Poll(0)));

  EXPECT_GE(0, RETRY_EINTR(p->Poll(0)));

  EXPECT_EQ(0, c2->Discard());



  EXPECT_LE(0, HANDLE_EINTR(p->Poll(0)));

  EXPECT_LE(0, RETRY_EINTR(p->Poll(0)));

  EXPECT_EQ(0, p->Gain(&fence));

  EXPECT_GE(0, HANDLE_EINTR(p->Poll(0)));

  EXPECT_GE(0, RETRY_EINTR(p->Poll(0)));

}



TEST_F(LibBufferHubTest, TestWithCustomMetadata) {
@@ -69,7 +77,7 @@ TEST_F(LibBufferHubTest, TestWithCustomMetadata) { 


  Metadata m = {1, 3};

  EXPECT_EQ(0, p->Post(LocalHandle(), m));

  EXPECT_LE(0, HANDLE_EINTR(c->Poll(10)));

  EXPECT_LE(0, RETRY_EINTR(c->Poll(10)));



  LocalHandle fence;

  Metadata m2 = {};
@@ -78,7 +86,7 @@ TEST_F(LibBufferHubTest, TestWithCustomMetadata) { 
  EXPECT_EQ(m.field2, m2.field2);



  EXPECT_EQ(0, c->Release(LocalHandle()));

  EXPECT_LT(0, HANDLE_EINTR(p->Poll(0)));

  EXPECT_LT(0, RETRY_EINTR(p->Poll(0)));

}



TEST_F(LibBufferHubTest, TestPostWithWrongMetaSize) {
@@ -95,7 +103,7 @@ TEST_F(LibBufferHubTest, TestPostWithWrongMetaSize) { 


  int64_t sequence = 3;

  EXPECT_NE(0, p->Post(LocalHandle(), sequence));

  EXPECT_GE(0, HANDLE_EINTR(c->Poll(10)));

  EXPECT_GE(0, RETRY_EINTR(c->Poll(10)));

}



TEST_F(LibBufferHubTest, TestAcquireWithWrongMetaSize) {

libs/vr/libbufferhub/include/private/dvr/native_buffer.h

+2 −3
Original line number Diff line number Diff line
@@ -4,8 +4,7 @@ 
#include <EGL/egl.h>

#include <EGL/eglext.h>

#include <android/native_window.h>

#include <base/logging.h>

#include <cutils/log.h>

#include <log/log.h>

#include <system/window.h>

#include <ui/ANativeObjectBase.h>

#include <utils/RefBase.h>
@@ -181,7 +180,7 @@ class NativeBufferConsumer : public android::ANativeObjectBase< 
    ANativeWindowBuffer::stride = buffer_->stride();

    ANativeWindowBuffer::format = buffer_->format();

    ANativeWindowBuffer::usage = buffer_->usage();

    CHECK(buffer_->slice_count() > index);

    LOG_ALWAYS_FATAL_IF(buffer_->slice_count() <= index);

    handle = buffer_->slice(index)->handle();

  }

libs/vr/libbufferhub/ion_buffer.cpp

+1 −1
Original line number Diff line number Diff line 
#include <private/dvr/ion_buffer.h>



#include <cutils/log.h>

#include <log/log.h>

#define ATRACE_TAG ATRACE_TAG_GRAPHICS

#include <utils/Trace.h>