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

Commit e6b720f6 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9420774 from 6e3ca218 to udc-release 

Change-Id: I7a3d494633b19dacb992fc1a02c59a975da9f35d
parents 2018ff9c 6e3ca218

libs/gui/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -192,6 +192,7 @@ cc_library_shared { 
        "BitTube.cpp",

        "BLASTBufferQueue.cpp",

        "BufferItemConsumer.cpp",

        "Choreographer.cpp",

        "CompositorTiming.cpp",

        "ConsumerBase.cpp",

        "CpuConsumer.cpp",
@@ -234,6 +235,7 @@ cc_library_shared { 


    export_header_lib_headers: [

        "libgui_aidl_headers",

        "jni_headers",

    ],



    aidl: {
@@ -241,6 +243,7 @@ cc_library_shared { 
    },



    header_libs: [

        "jni_headers",

        "libdvr_headers",

        "libgui_aidl_headers",

        "libpdx_headers",

libs/nativedisplay/Choreographer.cpp→libs/gui/Choreographer.cpp

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


// #define LOG_NDEBUG 0



#include <gui/Choreographer.h>

#include <jni.h>

#include <nativedisplay/Choreographer.h>



#undef LOG_TAG

#define LOG_TAG "AChoreographer"

libs/nativedisplay/include/nativedisplay/Choreographer.h→libs/gui/include/gui/Choreographer.h

+2 −1
Original line number Diff line number Diff line
@@ -16,8 +16,9 @@ 


#pragma once



#include <android/choreographer.h>

#include <gui/DisplayEventDispatcher.h>

#include <private/android/choreographer.h>

#include <jni.h>

#include <utils/Looper.h>



#include <mutex>

libs/nativedisplay/AChoreographer.cpp

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


#include <android-base/thread_annotations.h>

#include <android/gui/ISurfaceComposer.h>

#include <gui/Choreographer.h>

#include <jni.h>

#include <nativedisplay/Choreographer.h>

#include <private/android/choreographer.h>

#include <utils/Looper.h>

#include <utils/Timers.h>

libs/nativedisplay/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ cc_library_shared { 
        ":libgui_frame_event_aidl",

        "AChoreographer.cpp",

        "ADisplay.cpp",

        "Choreographer.cpp",

        "surfacetexture/surface_texture.cpp",

        "surfacetexture/SurfaceTexture.cpp",

        "surfacetexture/ImageConsumer.cpp",