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

Commit 87551225 authored by Courtney Goeltzenleuchter's avatar Courtney Goeltzenleuchter
Browse files

Update hwcomposer include paths 

In preparation of new hwcomposer interface, updating
existing includes to include specific version.
Bug: 71513561
Test: compile

Change-Id: Iab13368f782067f255f7dee5318bfd57872f30dd
parent 5e92144c

libs/vr/libvrflinger/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ includeFiles = [ "include" ] 


staticLibraries = [

    "libsurfaceflingerincludes",

    "libhwcomposer-command-buffer",

    "libbufferhub",

    "libbufferhubqueue",

    "libdisplay",
@@ -64,7 +63,8 @@ sharedLibraries = [ 
]



headerLibraries = [

    "libdvr_headers"

    "libdvr_headers",

    "android.hardware.graphics.composer@2.1-command-buffer",

]



cc_library_static {

services/surfaceflinger/Android.mk

+3 −1
Original line number Diff line number Diff line
@@ -59,13 +59,15 @@ LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES 
LOCAL_CFLAGS += -fvisibility=hidden -Werror=format



LOCAL_STATIC_LIBRARIES := \

    libhwcomposer-command-buffer \

    libtrace_proto \

    libvkjson \

    libvr_manager \

    libvrflinger \

    libserviceutils



LOCAL_HEADER_LIBRARIES := \

    android.hardware.graphics.composer@2.1-command-buffer



LOCAL_EXPORT_STATIC_LIBRARY_HEADERS := libserviceutils



LOCAL_SHARED_LIBRARIES := \

services/surfaceflinger/DisplayHardware/ComposerHal.h

+1 −1
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ 


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

#include <android/hardware/graphics/composer/2.1/IComposer.h>

#include <composer-command-buffer/2.1/ComposerCommandBuffer.h>

#include <utils/StrongPointer.h>

#include <IComposerCommandBuffer.h>



namespace android {

services/surfaceflinger/tests/fakehwc/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -31,6 +31,9 @@ cc_test { 
        "libtrace_proto",

        "libgmock"

    ],

    header_libs: [

        "android.hardware.graphics.composer@2.1-command-buffer",

    ],

    cppflags: [

        "-std=c++1z",

    ],

services/vr/hardware_composer/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -32,6 +32,10 @@ cc_library_shared { 
    "libutils",

  ],



  header_libs: [

    "android.hardware.graphics.composer@2.1-command-buffer",

  ],



  export_static_lib_headers: [

    "libhwcomposer-client",

  ],