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

Commit e6160cfe authored by Orion Hodson's avatar Orion Hodson Committed by Android (Google) Code Review
Browse files

Merge "nativedisplay: drop unused dependency on libnativehelper" into sc-dev

parents d39555c1 e53587b4

libs/nativedisplay/AChoreographer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#include <gui/DisplayEventDispatcher.h>

#include <gui/ISurfaceComposer.h>

#include <gui/SurfaceComposerClient.h>

#include <nativehelper/JNIHelp.h>

#include <jni.h>

#include <private/android/choreographer.h>

#include <utils/Looper.h>

#include <utils/Timers.h>

libs/nativedisplay/Android.bp

+3 −5
Original line number Diff line number Diff line
@@ -53,15 +53,13 @@ cc_library_shared { 
        "libcutils",

        "libEGL",

        "libGLESv2",

        "libnativehelper",

    ],



    export_shared_lib_headers: [

        "libnativehelper",

    ],

    export_header_lib_headers: ["jni_headers"],



    header_libs: [

        "jni_headers",

        "libnativedisplay_headers",

        "libnativehelper_header_only",

    ],



}

libs/nativedisplay/include-private/private/android/choreographer.h

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 


#include <apex/choreographer.h>

#include <inttypes.h>

#include <nativehelper/JNIHelp.h>

#include <jni.h>



namespace android {

libs/nativedisplay/include/surfacetexture/surface_texture_platform.h

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 


#include <EGL/egl.h>

#include <EGL/eglext.h>

#include <nativehelper/JNIHelp.h>

#include <jni.h>

#include <system/graphics.h>



// This file provides a facade API on top of SurfaceTexture, which avoids using

libs/nativedisplay/surfacetexture/surface_texture.cpp

+1 −2
Original line number Diff line number Diff line
@@ -29,8 +29,7 @@ 
#include <mutex>



#include <jni.h>

#include <nativehelper/JNIHelp.h>

#include <nativehelper/ScopedLocalRef.h>

#include <nativehelper/scoped_local_ref.h>



struct ASurfaceTexture {

    android::sp<android::SurfaceTexture> consumer;