diff options
| author | Orion Hodson <oth@google.com> | 2021-02-23 21:56:31 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-23 21:56:31 +0000 |
| commit | 18b34ba757c38f1e8c72d3b31120acd358ef5c3e (patch) | |
| tree | 1e4fc747abd360ef02cec4229e07b19ff7263832 | |
| parent | ca3e579e96622af40cbf7d5f050c9421be81c1cb (diff) | |
| parent | 82a8c40f72529e3e208bed48badee4a26ea7ba4f (diff) | |
| download | native-18b34ba757c38f1e8c72d3b31120acd358ef5c3e.tar.gz | |
Merge "Remove unnecessary dependency on libnativehelper.so" am: 82a8c40f72
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1594053
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I46b014124a3668d7a62b122c809816202643044c
5 files changed, 6 insertions, 10 deletions
diff --git a/libs/nativedisplay/AChoreographer.cpp b/libs/nativedisplay/AChoreographer.cpp index b431cbb6c0..62a4d7f208 100644 --- a/libs/nativedisplay/AChoreographer.cpp +++ b/libs/nativedisplay/AChoreographer.cpp @@ -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> diff --git a/libs/nativedisplay/Android.bp b/libs/nativedisplay/Android.bp index 2189a429fb..6e9c9990ec 100644 --- a/libs/nativedisplay/Android.bp +++ b/libs/nativedisplay/Android.bp @@ -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"], } diff --git a/libs/nativedisplay/include-private/private/android/choreographer.h b/libs/nativedisplay/include-private/private/android/choreographer.h index 21649304bf..c00ce4ee9c 100644 --- a/libs/nativedisplay/include-private/private/android/choreographer.h +++ b/libs/nativedisplay/include-private/private/android/choreographer.h @@ -18,7 +18,7 @@ #include <apex/choreographer.h> #include <inttypes.h> -#include <nativehelper/JNIHelp.h> +#include <jni.h> namespace android { diff --git a/libs/nativedisplay/include/surfacetexture/surface_texture_platform.h b/libs/nativedisplay/include/surfacetexture/surface_texture_platform.h index f3716674c5..85fe42f6fd 100644 --- a/libs/nativedisplay/include/surfacetexture/surface_texture_platform.h +++ b/libs/nativedisplay/include/surfacetexture/surface_texture_platform.h @@ -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 diff --git a/libs/nativedisplay/surfacetexture/surface_texture.cpp b/libs/nativedisplay/surfacetexture/surface_texture.cpp index ebe4484873..c214ab7718 100644 --- a/libs/nativedisplay/surfacetexture/surface_texture.cpp +++ b/libs/nativedisplay/surfacetexture/surface_texture.cpp @@ -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; |