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

Commit 95962e57 authored by Orion Hodson's avatar Orion Hodson
Browse files

Remove unnecessary dependency on libnativehelper.so 

libnativedisplay is a transitive dependency of bootanimation and
as libnativehelper.so is in the ART APEX, libnativehelper.so may not
be available when bootanimation runs. nativedisplay just depends on
jni.h and the header-only library libnativehelper_header_only.

Bug: 179115178
Test: m
Change-Id: I3a9f277d27e69b0ff6e9c29c3e2a8a6a7179b9a9
Merged-In: I3a9f277d27e69b0ff6e9c29c3e2a8a6a7179b9a9
(cherry-picked from commit e53587b4)

Change-Id: I80353136f63f5e12276bce7758b423febb2e3968
parent cc9d967d

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

+2 −5
Original line number Diff line number Diff line
@@ -72,15 +72,12 @@ cc_library_shared { 
        "libcutils",

        "libEGL",

        "libGLESv2",

        "libnativehelper",

    ],



    export_shared_lib_headers: [

        "libnativehelper",

    ],



    header_libs: [

        "libnativedisplay_headers",

        "libnativehelper_header_only",

    ],



    export_header_lib_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;