diff options
| author | Derek Sollenberger <djsollen@google.com> | 2020-02-21 11:43:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-02-21 11:43:02 +0000 |
| commit | 76e7430baead21c67fd4c81a36774a6461d2fb99 (patch) | |
| tree | 239a62b59c57b4b95d8e82943bf9a48e84439819 /native | |
| parent | 1ab8e44c06ca05806a81c6737cb3f6e316d8d25a (diff) | |
| parent | 2173ea286afff6766043227de0bc2d82d9595f77 (diff) | |
Merge changes from topic "HWUI_JNI"
* changes:
Export symbols for the newly exposed APEX/internal headers
Remove dependence on libandroid_runtime from Bitmap.cpp
Update Region.cpp to use AParcel NDK APIs
Cleanup header and build targets for libhwui clients.
Remove dependencies on headers outside UI module
Cleanup LOG_TAG when bundled in HWUI
Move android.graphics JNI & APEX files into HWUI
Diffstat (limited to 'native')
| -rw-r--r-- | native/android/Android.bp | 2 | ||||
| -rw-r--r-- | native/graphics/jni/Android.bp | 2 | ||||
| -rw-r--r-- | native/graphics/jni/imagedecoder.cpp | 2 | ||||
| -rw-r--r-- | native/webview/plat_support/Android.bp | 4 | ||||
| -rw-r--r-- | native/webview/plat_support/graphics_utils.cpp | 4 |
5 files changed, 9 insertions, 5 deletions
diff --git a/native/android/Android.bp b/native/android/Android.bp index 640861bcc391..ed73f39e57f8 100644 --- a/native/android/Android.bp +++ b/native/android/Android.bp @@ -83,6 +83,8 @@ cc_library_shared { "libarect", ], + header_libs: [ "libhwui_internal_headers" ], + whole_static_libs: ["libnativedisplay", "libnativewindow"], export_static_lib_headers: ["libarect"], diff --git a/native/graphics/jni/Android.bp b/native/graphics/jni/Android.bp index 376ea77740c2..15b473c2a6ab 100644 --- a/native/graphics/jni/Android.bp +++ b/native/graphics/jni/Android.bp @@ -37,6 +37,8 @@ cc_library_shared { "liblog", ], + header_libs: [ "libhwui_internal_headers" ], + static_libs: ["libarect"], arch: { diff --git a/native/graphics/jni/imagedecoder.cpp b/native/graphics/jni/imagedecoder.cpp index d1946b085df4..56f390698eb2 100644 --- a/native/graphics/jni/imagedecoder.cpp +++ b/native/graphics/jni/imagedecoder.cpp @@ -20,7 +20,7 @@ #include <android/bitmap.h> #include <android/data_space.h> #include <android/imagedecoder.h> -#include <android/graphics/MimeType.h> +#include <MimeType.h> #include <android/rect.h> #include <hwui/ImageDecoder.h> #include <log/log.h> diff --git a/native/webview/plat_support/Android.bp b/native/webview/plat_support/Android.bp index 88decc86c387..1a3b36d046e1 100644 --- a/native/webview/plat_support/Android.bp +++ b/native/webview/plat_support/Android.bp @@ -30,12 +30,14 @@ cc_library_shared { "graphic_buffer_impl.cpp", ], + header_libs: [ "libhwui_internal_headers" ], + shared_libs: [ "libandroidfw", - "libandroid_runtime", "libcutils", "libhwui", "liblog", + "libnativehelper", "libui", "libutils", "libvulkan", diff --git a/native/webview/plat_support/graphics_utils.cpp b/native/webview/plat_support/graphics_utils.cpp index 56825cee4520..8d7a59e46e72 100644 --- a/native/webview/plat_support/graphics_utils.cpp +++ b/native/webview/plat_support/graphics_utils.cpp @@ -25,11 +25,9 @@ #include <cstdlib> #include <jni.h> #include <utils/Log.h> -#include "android/graphics/GraphicsJNI.h" +#include "GraphicsJNI.h" #include "graphic_buffer_impl.h" #include "SkCanvasStateUtils.h" -#include "SkGraphics.h" -#include "SkPicture.h" #define NELEM(x) ((int) (sizeof(x) / sizeof((x)[0]))) |