diff options
| -rw-r--r-- | libs/input/Android.bp | 1 | ||||
| -rw-r--r-- | libs/input/tests/Android.bp | 1 | ||||
| -rw-r--r-- | native/android/Android.bp | 2 | ||||
| -rw-r--r-- | native/graphics/jni/Android.bp | 2 | ||||
| -rw-r--r-- | native/webview/plat_support/Android.bp | 4 | ||||
| -rw-r--r-- | native/webview/plat_support/graphics_utils.cpp | 4 | ||||
| -rw-r--r-- | rs/jni/Android.mk | 1 |
7 files changed, 11 insertions, 4 deletions
diff --git a/libs/input/Android.bp b/libs/input/Android.bp index 6bb896fd7b29..88d6033ed9fb 100644 --- a/libs/input/Android.bp +++ b/libs/input/Android.bp @@ -23,6 +23,7 @@ cc_library_shared { "libandroid_runtime", "libbinder", "libcutils", + "libhwui", "liblog", "libutils", "libgui", diff --git a/libs/input/tests/Android.bp b/libs/input/tests/Android.bp index b1e3d6fe845a..213b3adfb2a8 100644 --- a/libs/input/tests/Android.bp +++ b/libs/input/tests/Android.bp @@ -20,6 +20,7 @@ cc_test { shared_libs: [ "libandroid_runtime", "libinputservice", + "libhwui", "libgui", "libutils", ], diff --git a/native/android/Android.bp b/native/android/Android.bp index 257ae7332cc1..0a8ef38303a1 100644 --- a/native/android/Android.bp +++ b/native/android/Android.bp @@ -81,6 +81,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/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]))) diff --git a/rs/jni/Android.mk b/rs/jni/Android.mk index f9ef0b7b8e9d..a4bea661583b 100644 --- a/rs/jni/Android.mk +++ b/rs/jni/Android.mk @@ -11,6 +11,7 @@ LOCAL_SHARED_LIBRARIES := \ libnativehelper \ libRS \ libcutils \ + libhwui \ liblog \ libutils \ libui \ |