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

Commit 481f81b0 authored by Orion Hodson's avatar Orion Hodson Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/13453574

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5cd55f476a04241a726432105f4f9f1b6705d063
parents d954eaa6 e6160cfe

libs/nativedisplay/AChoreographer.cpp

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

#include <gui/DisplayEventDispatcher.h>

#include <gui/ISurfaceComposer.h>

#include <gui/ISurfaceComposer.h>

#include <gui/SurfaceComposerClient.h>

#include <gui/SurfaceComposerClient.h>

#include <nativehelper/JNIHelp.h>

#include <jni.h>

#include <private/android/choreographer.h>

#include <private/android/choreographer.h>

#include <utils/Looper.h>

#include <utils/Looper.h>

#include <utils/Timers.h>

#include <utils/Timers.h>

libs/nativedisplay/Android.bp

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

        "libcutils",

        "libEGL",

        "libEGL",

        "libGLESv2",

        "libGLESv2",

        "libnativehelper",

    ],

    ],





    export_shared_lib_headers: [

    export_header_lib_headers: ["jni_headers"],

        "libnativehelper",

    ],





    header_libs: [

    header_libs: [

        "jni_headers",

        "libnativedisplay_headers",

        "libnativedisplay_headers",

        "libnativehelper_header_only",

    ],

    ],



}
 
}

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

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




#include <apex/choreographer.h>

#include <apex/choreographer.h>

#include <inttypes.h>

#include <inttypes.h>

#include <nativehelper/JNIHelp.h>

#include <jni.h>





namespace android {

namespace android {

libs/nativedisplay/include/surfacetexture/surface_texture_platform.h

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




#include <EGL/egl.h>

#include <EGL/egl.h>

#include <EGL/eglext.h>

#include <EGL/eglext.h>

#include <nativehelper/JNIHelp.h>

#include <jni.h>

#include <system/graphics.h>

#include <system/graphics.h>





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

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

libs/nativedisplay/surfacetexture/surface_texture.cpp

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

#include <mutex>





#include <jni.h>

#include <jni.h>

#include <nativehelper/JNIHelp.h>

#include <nativehelper/scoped_local_ref.h>

#include <nativehelper/ScopedLocalRef.h>





struct ASurfaceTexture {

struct ASurfaceTexture {

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

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