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

Commit 5ecd86aa 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.
Note: IComposerCommandBuffer.h was moved, renamed and clang
formated, but otherwise had no code changes.
Bug: 71513561
Test: compile

Change-Id: If34cb6f63012592a245708109590653ace7009f5
parent 6b444872

graphics/composer/2.1/default/Android.bp

+6 −7
Original line number Diff line number Diff line
@@ -17,6 +17,9 @@ cc_library_static { 
        "libsync",

        "libutils",

    ],

    header_libs: [

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

    ],

}



cc_library_shared {
@@ -41,6 +44,9 @@ cc_library_shared { 
        "libhwc2on1adapter",

        "libhwc2onfbadapter",

    ],

    header_libs: [

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

    ],

}



cc_binary {
@@ -65,10 +71,3 @@ cc_binary { 
        "libutils",

    ],

}
 


cc_library_static {

    name: "libhwcomposer-command-buffer",

    defaults: ["hidl_defaults"],

    shared_libs: ["android.hardware.graphics.composer@2.1"],

    export_include_dirs: ["."],

}

graphics/composer/2.1/default/ComposerClient.cpp

+1 −2
Original line number Diff line number Diff line
@@ -19,9 +19,8 @@ 
#include <android/hardware/graphics/mapper/2.0/IMapper.h>

#include <log/log.h>



#include "ComposerClient.h"

#include "ComposerBase.h"

#include "IComposerCommandBuffer.h"

#include "ComposerClient.h"



namespace android {

namespace hardware {

graphics/composer/2.1/default/ComposerClient.h

+1 −1
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ 
#include <unordered_map>

#include <vector>



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

#include <hardware/hwcomposer2.h>

#include "IComposerCommandBuffer.h"

#include "ComposerBase.h"



namespace android {

graphics/composer/2.1/default/OWNERS

+1 −0
Original line number Diff line number Diff line 
# Graphics team

courtneygo@google.com

jessehall@google.com

olv@google.com

stoza@google.com

graphics/composer/2.1/utils/OWNERS

0 → 100644
+4 −0
Original line number Diff line number Diff line 
courtneygo@google.com

jessehall@google.com

olv@google.com

stoza@google.com