From ee538a3a8578e684b0d04743a3e5904d622960ba Mon Sep 17 00:00:00 2001
From: Derek Sollenberger <djsollen@google.com>
Date: Wed, 19 Feb 2020 11:51:17 -0500
Subject: 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
---
 native/android/Android.bp                      | 2 ++
 native/graphics/jni/Android.bp                 | 2 ++
 native/webview/plat_support/Android.bp         | 4 +++-
 native/webview/plat_support/graphics_utils.cpp | 4 +---
 4 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'native')

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])))
 
-- 
cgit v1.2.3