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

Commit 795e7879 authored by Ady Abraham's avatar Ady Abraham Committed by Android (Google) Code Review
Browse files

Merge changes from topic "composer_aidl_command_buffer" 

* changes:
  SF: split ComposerHal to Hidl/Aidl files
  SF: use AIDL composer
parents a59aa786 9fc2805c

libs/vr/libvrflinger/Android.bp

+5 −1
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ staticLibraries = [ 
    "libbroadcastring",

    "libvr_manager",

    "libbroadcastring",

    "libaidlcommonsupport",

]



sharedLibraries = [
@@ -50,7 +51,9 @@ sharedLibraries = [ 
    "android.hardware.graphics.composer@2.2",

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

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

    "android.hardware.graphics.composer3-V1-ndk",

    "libbinder",

    "libbinder_ndk",

    "libbase",

    "libbufferhubqueue",

    "libcutils",
@@ -76,6 +79,7 @@ headerLibraries = [ 
    "android.hardware.graphics.composer@2.2-command-buffer",

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

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

    "android.hardware.graphics.composer3-command-buffer",

    "libdvr_headers",

    "libsurfaceflinger_headers",

]

libs/vr/libvrflinger/hardware_composer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ void HardwareComposer::UpdatePostThreadState(PostThreadStateType state, 
void HardwareComposer::CreateComposer() {

  if (composer_)

    return;

  composer_.reset(new Hwc2::impl::Composer("default"));

  composer_ = Hwc2::Composer::create("default");

  composer_callback_ = new ComposerCallback;

  composer_->registerCallback(composer_callback_);

  LOG_ALWAYS_FATAL_IF(!composer_callback_->GotFirstHotplug(),

services/surfaceflinger/Android.bp

+10 −0
Original line number Diff line number Diff line
@@ -39,15 +39,19 @@ cc_defaults { 
        "android.hardware.graphics.allocator@2.0",

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

        "android.hardware.graphics.common@1.2",

        "android.hardware.common-V2-ndk",

        "android.hardware.common.fmq-V1-ndk",

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

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

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

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

        "android.hardware.graphics.composer3-V1-ndk",

        "android.hardware.power@1.0",

        "android.hardware.power@1.3",

        "android.hardware.power-V2-cpp",

        "libbase",

        "libbinder",

        "libbinder_ndk",

        "libcutils",

        "libEGL",

        "libfmq",
@@ -69,18 +73,21 @@ cc_defaults { 
        "server_configurable_flags",

    ],

    static_libs: [

        "libaidlcommonsupport",

        "libcompositionengine",

        "libframetimeline",

        "libperfetto_client_experimental",

        "librenderengine",

        "libserviceutils",

        "libtrace_proto",

        "libaidlcommonsupport",

    ],

    header_libs: [

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

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

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

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

        "android.hardware.graphics.composer3-command-buffer",

    ],

    export_static_lib_headers: [

        "libcompositionengine",
@@ -95,6 +102,7 @@ cc_defaults { 
        "android.hardware.graphics.composer@2.2",

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

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

        "android.hardware.graphics.composer3-V1-ndk",

        "android.hardware.power@1.3",

        "libhidlbase",

        "libtimestats",
@@ -144,6 +152,8 @@ filegroup { 
        "EffectLayer.cpp",

        "ContainerLayer.cpp",

        "DisplayDevice.cpp",

        "DisplayHardware/AidlComposerHal.cpp",

        "DisplayHardware/HidlComposerHal.cpp",

        "DisplayHardware/ComposerHal.cpp",

        "DisplayHardware/DisplayIdentification.cpp",

        "DisplayHardware/FramebufferSurface.cpp",

services/surfaceflinger/CompositionEngine/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ cc_defaults { 
        "android.hardware.graphics.composer@2.2",

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

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

        "android.hardware.graphics.composer3-V1-ndk",

        "android.hardware.power@1.0",

        "android.hardware.power@1.3",

        "libbase",
@@ -38,12 +39,14 @@ cc_defaults { 
        "libmath",

        "librenderengine",

        "libtrace_proto",

        "libaidlcommonsupport",

    ],

    header_libs: [

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

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

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

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

        "android.hardware.graphics.composer3-command-buffer",

        "libsurfaceflinger_headers",

    ],

}