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

Commit 3bf4f0ac authored by Daniel Nicoara's avatar Daniel Nicoara Committed by android-build-merger
Browse files

Merge "VR: Remove HIDL VR Composer from service/vr/vr_window_manager" into oc-dev am: b3244571 

am: 8d372ef5

Change-Id: I4fb0c8ae3f40805b7d37c7a4dff72e4e3e92eb28
parents 2a46c026 8d372ef5

libs/vr/libvrflinger/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ staticLibraries = [ 
]



sharedLibraries = [

    "android.dvr.composer@1.0",

    "android.hardware.graphics.allocator@2.0",

    "android.hardware.graphics.composer@2.1",

    "libbinder",

services/surfaceflinger/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ LOCAL_STATIC_LIBRARIES := \ 
    libvrflinger



LOCAL_SHARED_LIBRARIES := \

    android.dvr.composer@1.0 \

    android.frameworks.vr.composer@1.0 \

    android.hardware.graphics.allocator@2.0 \

    android.hardware.graphics.composer@2.1 \

    android.hardware.configstore@1.0 \

services/surfaceflinger/DisplayHardware/ComposerHal.cpp

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#undef LOG_TAG

#define LOG_TAG "HwcComposer"



#include <android/dvr/composer/1.0/IVrComposerClient.h>

#include <android/frameworks/vr/composer/1.0/IVrComposerClient.h>

#include <inttypes.h>

#include <log/log.h>

#include <gui/BufferQueue.h>
@@ -26,7 +26,7 @@ 


namespace android {



using dvr::composer::V1_0::IVrComposerClient;

using frameworks::vr::composer::V1_0::IVrComposerClient;

using hardware::Return;

using hardware::hidl_vec;

using hardware::hidl_handle;

services/vr/hardware_composer/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ cc_binary { 
    "libvr_hwc-binder",

  ],

  shared_libs: [

    "android.dvr.composer@1.0",

    "android.frameworks.vr.composer@1.0",

    "android.hardware.graphics.composer@2.1",

    "libbase",

    "libbinder",

services/vr/vr_window_manager/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ static_libs = [ 
]



shared_libs = [

    "android.dvr.composer@1.0",

    "android.frameworks.vr.composer@1.0",

    "android.hardware.graphics.composer@2.1",

    "libvrhwc",

    "libbase",