Cleanup header and build targets for libhwui clients.

Targets that will also be contained within the UI module
are allowed to access internal headers.  All other targets
that depend on libhwui are restricted to using the APEX headers.

Bug: 137655431
Test: CtsUiRenderingTestCases
Change-Id: Id92e9874dafb98bd79839d45ab8f22ab999689de

libs/input/Android.bp

@@ -23,6 +23,7 @@ cc_library_shared {
         "libandroid_runtime",
         "libbinder",
         "libcutils",
+        "libhwui",
         "liblog",
         "libutils",
         "libgui",

libs/input/tests/Android.bp

@@ -20,6 +20,7 @@ cc_test {
     shared_libs: [
         "libandroid_runtime",
         "libinputservice",
+        "libhwui",
         "libgui",
         "libutils",
     ],

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"],

native/graphics/jni/Android.bp

@@ -37,6 +37,8 @@ cc_library_shared {
         "liblog",
     ],
 
+    header_libs: [ "libhwui_internal_headers" ],
+
     static_libs: ["libarect"],
 
     arch: {

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",

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])))
 

rs/jni/Android.mk

@@ -11,6 +11,7 @@ LOCAL_SHARED_LIBRARIES := \
     libnativehelper \
     libRS \
     libcutils \
+    libhwui \
     liblog \
     libutils \
     libui \