Move android.graphics JNI & APEX files into HWUI

The graphics JNI code is now separate from libandroid_runtime
and it along with HWUI headers are no longer visible to targets
outside the boundary of what is to become the UI mainline module

The exposed headers to targets outside the module are now restriced
to C APIs contained in the apex header directory.

Bug: 137655431
Test: CtsUiRenderingTestCases
Change-Id: I30d34055b6870dc1039f190a88f4a747cee17300

92 files changed, 227 insertions, 167 deletions

diff --git a/core/jni/Android.bp b/core/jni/Android.bp
index 5912f4059548..d27be275f312 100644
--- a/core/jni/Android.bp
+++ b/core/jni/Android.bp
@@ -52,20 +52,11 @@ cc_library_shared {
         "system/media/private/camera/include",
     ],
 
-    static_libs: [
-        "libandroid_graphics",
-    ],
-
-    whole_static_libs: ["libandroid_graphics"],
-
-    export_static_lib_headers: ["libandroid_graphics"],
-
     shared_libs: [
         "libbase",
         "libcutils",
         "libharfbuzz_ng",
         "libhwui",
-        "libjpeg",
         "liblog",
         "libminikin",
         "libnativehelper",
@@ -107,6 +98,7 @@ cc_library_shared {
                 "android_database_SQLiteGlobal.cpp",
                 "android_database_SQLiteDebug.cpp",
                 "android_graphics_GraphicBuffer.cpp",
+                "android_graphics_SurfaceTexture.cpp",
                 "android_view_CompositionSamplingListener.cpp",
                 "android_view_DisplayEventReceiver.cpp",
                 "android_view_InputChannel.cpp",
@@ -182,8 +174,6 @@ cc_library_shared {
                 "android_hardware_UsbRequest.cpp",
                 "android_hardware_location_ActivityRecognitionHardware.cpp",
                 "android_util_FileObserver.cpp",
-                "android/graphics/GraphicsStatsService.cpp",
-                "android/graphics/SurfaceTexture.cpp",
                 "android/opengl/poly_clip.cpp", // TODO: .arm
                 "android/opengl/util.cpp",
                 "android_server_NetworkManagementSocketTagger.cpp",
@@ -324,153 +314,3 @@ cc_library_shared {
         },
     },
 }
-
-cc_library_static {
-    name: "libandroid_graphics",
-    host_supported: true,
-    cflags: [
-        "-Wno-unused-parameter",
-        "-Wno-non-virtual-dtor",
-        "-Wno-maybe-uninitialized",
-        "-Wno-parentheses",
-
-        "-DGL_GLEXT_PROTOTYPES",
-        "-DEGL_EGLEXT_PROTOTYPES",
-
-        "-DU_USING_ICU_NAMESPACE=0",
-
-        "-Wall",
-        "-Werror",
-        "-Wno-error=deprecated-declarations",
-        "-Wunused",
-        "-Wunreachable-code",
-    ],
-
-    cppflags: ["-Wno-conversion-null"],
-
-    srcs: [
-        "android/graphics/apex/android_matrix.cpp",
-        "android/graphics/apex/android_paint.cpp",
-        "android/graphics/apex/android_region.cpp",
-
-        "android_graphics_animation_NativeInterpolatorFactory.cpp",
-        "android_graphics_animation_RenderNodeAnimator.cpp",
-        "android_graphics_Canvas.cpp",
-        "android_graphics_ColorSpace.cpp",
-        "android_graphics_drawable_AnimatedVectorDrawable.cpp",
-        "android_graphics_drawable_VectorDrawable.cpp",
-        "android_graphics_HardwareRendererObserver.cpp",
-        "android_graphics_Picture.cpp",
-        "android_nio_utils.cpp",
-        "android_view_DisplayListCanvas.cpp",
-        "android_view_RenderNode.cpp",
-        "android_util_PathParser.cpp",
-
-        "android/graphics/Bitmap.cpp",
-        "android/graphics/BitmapFactory.cpp",
-        "android/graphics/ByteBufferStreamAdaptor.cpp",
-        "android/graphics/Camera.cpp",
-        "android/graphics/CanvasProperty.cpp",
-        "android/graphics/ColorFilter.cpp",
-        "android/graphics/CreateJavaOutputStreamAdaptor.cpp",
-        "android/graphics/FontFamily.cpp",
-        "android/graphics/FontUtils.cpp",
-        "android/graphics/Graphics.cpp",
-        "android/graphics/ImageDecoder.cpp",
-        "android/graphics/Interpolator.cpp",
-        "android/graphics/MaskFilter.cpp",
-        "android/graphics/Matrix.cpp",
-        "android/graphics/NinePatch.cpp",
-        "android/graphics/NinePatchPeeker.cpp",
-        "android/graphics/Paint.cpp",
-        "android/graphics/PaintFilter.cpp",
-        "android/graphics/Path.cpp",
-        "android/graphics/PathEffect.cpp",
-        "android/graphics/PathMeasure.cpp",
-        "android/graphics/Picture.cpp",
-        "android/graphics/Region.cpp",
-        "android/graphics/Shader.cpp",
-        "android/graphics/Typeface.cpp",
-        "android/graphics/Utils.cpp",
-        "android/graphics/YuvToJpegEncoder.cpp",
-        "android/graphics/fonts/Font.cpp",
-        "android/graphics/fonts/FontFamily.cpp",
-        "android/graphics/text/LineBreaker.cpp",
-        "android/graphics/text/MeasuredText.cpp",
-    ],
-
-    local_include_dirs: [
-        "include",  // NEEDED FOR ANDROID RUNTIME
-        "android/graphics",
-        "android/graphics/apex/include",
-    ],
-
-    export_include_dirs: [
-        "android/graphics/apex/include",
-    ],
-
-    include_dirs: [
-        "external/skia/include/private",
-        "external/skia/src/codec",
-        "external/skia/src/core",
-        "external/skia/src/effects",
-        "external/skia/src/image",
-        "external/skia/src/images",
-    ],
-
-    shared_libs: [
-        "libbase",
-        "libcutils",
-        "libharfbuzz_ng",
-        "libhwui",
-        "liblog",
-        "libminikin",
-        "libnativehelper",
-        "libz",
-        "libziparchive",
-        "libjpeg",
-    ],
-
-    target: {
-        android: {
-            srcs: [ // sources that depend on android only libraries
-                "android/graphics/apex/android_canvas.cpp",
-                "android/graphics/apex/android_bitmap.cpp",
-                "android/graphics/apex/renderthread.cpp",
-                "android/graphics/apex/jni_runtime.cpp",
-
-                "android_view_TextureLayer.cpp",
-                "android_view_ThreadedRenderer.cpp",
-                "android/graphics/AnimatedImageDrawable.cpp",
-                "android/graphics/BitmapRegionDecoder.cpp",
-                "android/graphics/GIFMovie.cpp",
-                "android/graphics/Movie.cpp",
-                "android/graphics/MovieImpl.cpp",
-                "android/graphics/pdf/PdfDocument.cpp",
-                "android/graphics/pdf/PdfEditor.cpp",
-                "android/graphics/pdf/PdfRenderer.cpp",
-                "android/graphics/pdf/PdfUtils.cpp",
-            ],
-            shared_libs: [
-                "libandroidfw",
-                "libEGL",
-                "libmediandk",
-                "libnativedisplay",
-                "libnativewindow",
-                "libpdfium",
-            ],
-            static_libs: [
-                "libgif",
-            ],
-        },
-        host: {
-            cflags: [
-                "-Wno-unused-const-variable",
-                "-Wno-unused-function",
-            ],
-            static_libs: [
-                "libandroidfw",
-            ],
-        }
-    },
-}
diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp
index 4879478733e6..c41398c97ca0 100644
--- a/core/jni/AndroidRuntime.cpp
+++ b/core/jni/AndroidRuntime.cpp
@@ -115,6 +115,7 @@ extern int register_android_content_StringBlock(JNIEnv* env);
 extern int register_android_content_XmlBlock(JNIEnv* env);
 extern int register_android_content_res_ApkAssets(JNIEnv* env);
 extern int register_android_graphics_BLASTBufferQueue(JNIEnv* env);
+extern int register_android_graphics_SurfaceTexture(JNIEnv* env);
 extern int register_android_view_DisplayEventReceiver(JNIEnv* env);
 extern int register_android_view_InputApplicationHandle(JNIEnv* env);
 extern int register_android_view_InputWindowHandle(JNIEnv* env);
@@ -1484,6 +1485,7 @@ static const RegJNIRec gRegJNI[] = {
         REG_JNI(register_android_graphics_classes),
         REG_JNI(register_android_graphics_BLASTBufferQueue),
         REG_JNI(register_android_graphics_GraphicBuffer),
+        REG_JNI(register_android_graphics_SurfaceTexture),
         REG_JNI(register_android_database_CursorWindow),
         REG_JNI(register_android_database_SQLiteConnection),
         REG_JNI(register_android_database_SQLiteGlobal),
diff --git a/core/jni/android/graphics/SurfaceTexture.cpp b/core/jni/android_graphics_SurfaceTexture.cpp
index 2aca31733599..2aca31733599 100644
--- a/core/jni/android/graphics/SurfaceTexture.cpp
+++ b/core/jni/android_graphics_SurfaceTexture.cpp
diff --git a/libs/hwui/Android.bp b/libs/hwui/Android.bp
index 81dedda5341d..954e4daeffa7 100644
--- a/libs/hwui/Android.bp
+++ b/libs/hwui/Android.bp
@@ -152,9 +152,229 @@ cc_defaults {
 }
 
 // ------------------------
+// APEX
+// ------------------------
+
+cc_library_headers {
+    name: "android_graphics_apex_headers",
+
+    host_supported: true,
+    export_include_dirs: [
+        "apex/include",
+    ],
+    target: {
+        windows: {
+            enabled: true,
+        },
+    }
+}
+
+cc_defaults {
+    name: "android_graphics_apex",
+    host_supported: true,
+    cflags: [
+        "-Wno-unused-parameter",
+        "-Wno-non-virtual-dtor",
+        "-Wno-maybe-uninitialized",
+        "-Wno-parentheses",
+        "-Wall",
+        "-Werror",
+        "-Wno-error=deprecated-declarations",
+        "-Wunused",
+        "-Wunreachable-code",
+    ],
+
+    cppflags: ["-Wno-conversion-null"],
+
+    srcs: [
+        "apex/android_matrix.cpp",
+        "apex/android_paint.cpp",
+        "apex/android_region.cpp",
+    ],
+
+    header_libs: [ "android_graphics_apex_headers" ],
+
+    target: {
+        android: {
+            srcs: [ // sources that depend on android only libraries
+                "apex/android_bitmap.cpp",
+                "apex/android_canvas.cpp",
+                "apex/jni_runtime.cpp",
+                "apex/renderthread.cpp",
+            ],
+        },
+    },
+}
+
+// ------------------------
+// Android Graphics JNI
+// ------------------------
+
+cc_library_headers {
+    name: "android_graphics_jni_headers",
+
+    host_supported: true,
+    export_include_dirs: [
+        "jni",
+    ],
+    target: {
+        windows: {
+            enabled: true,
+        },
+    }
+}
+
+cc_defaults {
+    name: "android_graphics_jni",
+    host_supported: true,
+    cflags: [
+        "-Wno-unused-parameter",
+        "-Wno-non-virtual-dtor",
+        "-Wno-maybe-uninitialized",
+        "-Wno-parentheses",
+
+        "-DGL_GLEXT_PROTOTYPES",
+        "-DEGL_EGLEXT_PROTOTYPES",
+
+        "-DU_USING_ICU_NAMESPACE=0",
+
+        "-Wall",
+        "-Werror",
+        "-Wno-error=deprecated-declarations",
+        "-Wunused",
+        "-Wunreachable-code",
+    ],
+
+    cppflags: ["-Wno-conversion-null"],
+
+    srcs: [
+        "jni/android_graphics_animation_NativeInterpolatorFactory.cpp",
+        "jni/android_graphics_animation_RenderNodeAnimator.cpp",
+        "jni/android_graphics_Canvas.cpp",
+        "jni/android_graphics_ColorSpace.cpp",
+        "jni/android_graphics_drawable_AnimatedVectorDrawable.cpp",
+        "jni/android_graphics_drawable_VectorDrawable.cpp",
+        "jni/android_graphics_HardwareRendererObserver.cpp",
+        "jni/android_graphics_Matrix.cpp",
+        "jni/android_graphics_Picture.cpp",
+        "jni/android_graphics_DisplayListCanvas.cpp",
+        "jni/android_graphics_RenderNode.cpp",
+        "jni/android_nio_utils.cpp",
+        "jni/android_util_PathParser.cpp",
+
+        "jni/Bitmap.cpp",
+        "jni/BitmapFactory.cpp",
+        "jni/ByteBufferStreamAdaptor.cpp",
+        "jni/Camera.cpp",
+        "jni/CanvasProperty.cpp",
+        "jni/ColorFilter.cpp",
+        "jni/CreateJavaOutputStreamAdaptor.cpp",
+        "jni/FontFamily.cpp",
+        "jni/FontUtils.cpp",
+        "jni/Graphics.cpp",
+        "jni/ImageDecoder.cpp",
+        "jni/Interpolator.cpp",
+        "jni/MaskFilter.cpp",
+        "jni/NinePatch.cpp",
+        "jni/NinePatchPeeker.cpp",
+        "jni/Paint.cpp",
+        "jni/PaintFilter.cpp",
+        "jni/Path.cpp",
+        "jni/PathEffect.cpp",
+        "jni/PathMeasure.cpp",
+        "jni/Picture.cpp",
+        "jni/Region.cpp",
+        "jni/Shader.cpp",
+        "jni/Typeface.cpp",
+        "jni/Utils.cpp",
+        "jni/YuvToJpegEncoder.cpp",
+        "jni/fonts/Font.cpp",
+        "jni/fonts/FontFamily.cpp",
+        "jni/text/LineBreaker.cpp",
+        "jni/text/MeasuredText.cpp",
+    ],
+
+    header_libs: [ "android_graphics_jni_headers" ],
+
+    include_dirs: [
+        "external/skia/include/private",
+        "external/skia/src/codec",
+        "external/skia/src/core",
+        "external/skia/src/effects",
+        "external/skia/src/image",
+        "external/skia/src/images",
+    ],
+
+    shared_libs: [
+        "libbase",
+        "libbinder",
+        "libcutils",
+        "libharfbuzz_ng",
+        "liblog",
+        "libminikin",
+        "libnativehelper",
+        "libz",
+        "libziparchive",
+        "libjpeg",
+    ],
+
+    target: {
+        android: {
+            srcs: [ // sources that depend on android only libraries
+                "jni/AnimatedImageDrawable.cpp",
+                "jni/android_graphics_TextureLayer.cpp",
+                "jni/android_graphics_HardwareRenderer.cpp",
+                "jni/BitmapRegionDecoder.cpp",
+                "jni/GIFMovie.cpp",
+                "jni/GraphicsStatsService.cpp",
+                "jni/Movie.cpp",
+                "jni/MovieImpl.cpp",
+                "jni/pdf/PdfDocument.cpp",
+                "jni/pdf/PdfEditor.cpp",
+                "jni/pdf/PdfRenderer.cpp",
+                "jni/pdf/PdfUtils.cpp",
+            ],
+            shared_libs: [
+                "libandroidfw",
+                "libmediandk",
+                "libnativedisplay",
+                "libnativewindow",
+                "libstatspull",
+                "libstatssocket",
+                "libpdfium",
+            ],
+            static_libs: [
+                "libgif",
+                "libstatslog",
+            ],
+        },
+        host: {
+            cflags: [
+                "-Wno-unused-const-variable",
+                "-Wno-unused-function",
+            ],
+            static_libs: [
+                "libandroidfw",
+            ],
+        }
+    },
+}
+
+// ------------------------
 // library
 // ------------------------
 
+cc_library_headers {
+    name: "libhwui_internal_headers",
+
+    host_supported: true,
+    export_include_dirs: [
+        ".",
+    ],
+    header_libs: [ "android_graphics_jni_headers" ],
+    export_header_lib_headers: [ "android_graphics_jni_headers" ],
+}
+
 cc_defaults {
     name: "libhwui_defaults",
     defaults: ["hwui_defaults"],
@@ -205,11 +425,8 @@ cc_defaults {
         export_proto_headers: true,
     },
 
-    export_include_dirs: ["."],
-
     target: {
         android: {
-
             srcs: [
                 "hwui/AnimatedImageThread.cpp",
                 "pipeline/skia/ATraceMemoryDump.cpp",
@@ -274,7 +491,10 @@ cc_library {
     host_supported: true,
     defaults: [
         "libhwui_defaults",
+        "android_graphics_apex",
+        "android_graphics_jni",
     ],
+    export_header_lib_headers: ["android_graphics_apex_headers"],
 }
 
 cc_library_static {
diff --git a/core/jni/android/graphics/apex/TypeCast.h b/libs/hwui/apex/TypeCast.h
index 96721d007951..96721d007951 100644
--- a/core/jni/android/graphics/apex/TypeCast.h
+++ b/libs/hwui/apex/TypeCast.h
diff --git a/core/jni/android/graphics/apex/android_bitmap.cpp b/libs/hwui/apex/android_bitmap.cpp
index decd19071944..decd19071944 100644
--- a/core/jni/android/graphics/apex/android_bitmap.cpp
+++ b/libs/hwui/apex/android_bitmap.cpp
diff --git a/core/jni/android/graphics/apex/android_canvas.cpp b/libs/hwui/apex/android_canvas.cpp
index 2a939efed9bb..2a939efed9bb 100644
--- a/core/jni/android/graphics/apex/android_canvas.cpp
+++ b/libs/hwui/apex/android_canvas.cpp
diff --git a/core/jni/android/graphics/apex/android_matrix.cpp b/libs/hwui/apex/android_matrix.cpp
index 309360d9b0b3..693b22b62663 100644
--- a/core/jni/android/graphics/apex/android_matrix.cpp
+++ b/libs/hwui/apex/android_matrix.cpp
@@ -15,7 +15,7 @@
  */
 
 #include "android/graphics/matrix.h"
-#include "Matrix.h"
+#include "android_graphics_Matrix.h"
 
 bool AMatrix_getContents(JNIEnv* env, jobject matrixObj, float values[9]) {
     static_assert(SkMatrix::kMScaleX == 0, "SkMatrix unexpected index");
diff --git a/core/jni/android/graphics/apex/android_paint.cpp b/libs/hwui/apex/android_paint.cpp
index 70bd085343ce..70bd085343ce 100644
--- a/core/jni/android/graphics/apex/android_paint.cpp
+++ b/libs/hwui/apex/android_paint.cpp
diff --git a/core/jni/android/graphics/apex/android_region.cpp b/libs/hwui/apex/android_region.cpp
index 2030e7e69861..2030e7e69861 100644
--- a/core/jni/android/graphics/apex/android_region.cpp
+++ b/libs/hwui/apex/android_region.cpp
diff --git a/core/jni/android/graphics/apex/include/android/graphics/bitmap.h b/libs/hwui/apex/include/android/graphics/bitmap.h
index 45fec2ab7b43..45fec2ab7b43 100644
--- a/core/jni/android/graphics/apex/include/android/graphics/bitmap.h
+++ b/libs/hwui/apex/include/android/graphics/bitmap.h
diff --git a/core/jni/android/graphics/apex/include/android/graphics/canvas.h b/libs/hwui/apex/include/android/graphics/canvas.h
index 6fd6b0693b37..6fd6b0693b37 100644
--- a/core/jni/android/graphics/apex/include/android/graphics/canvas.h
+++ b/libs/hwui/apex/include/android/graphics/canvas.h
diff --git a/core/jni/android/graphics/apex/include/android/graphics/jni_runtime.h b/libs/hwui/apex/include/android/graphics/jni_runtime.h
index 872a9497ab90..872a9497ab90 100644
--- a/core/jni/android/graphics/apex/include/android/graphics/jni_runtime.h
+++ b/libs/hwui/apex/include/android/graphics/jni_runtime.h
diff --git a/core/jni/android/graphics/apex/include/android/graphics/matrix.h b/libs/hwui/apex/include/android/graphics/matrix.h
index 4039cd1b8f74..4039cd1b8f74 100644
--- a/core/jni/android/graphics/apex/include/android/graphics/matrix.h
+++ b/libs/hwui/apex/include/android/graphics/matrix.h
diff --git a/core/jni/android/graphics/apex/include/android/graphics/paint.h b/libs/hwui/apex/include/android/graphics/paint.h
index 5895e006bf93..5895e006bf93 100644
--- a/core/jni/android/graphics/apex/include/android/graphics/paint.h
+++ b/libs/hwui/apex/include/android/graphics/paint.h
diff --git a/core/jni/android/graphics/apex/include/android/graphics/region.h b/libs/hwui/apex/include/android/graphics/region.h
index 961067a8e2db..961067a8e2db 100644
--- a/core/jni/android/graphics/apex/include/android/graphics/region.h
+++ b/libs/hwui/apex/include/android/graphics/region.h
diff --git a/core/jni/android/graphics/apex/include/android/graphics/renderthread.h b/libs/hwui/apex/include/android/graphics/renderthread.h
index 0a790af731a9..0a790af731a9 100644
--- a/core/jni/android/graphics/apex/include/android/graphics/renderthread.h
+++ b/libs/hwui/apex/include/android/graphics/renderthread.h
diff --git a/core/jni/android/graphics/apex/jni_runtime.cpp b/libs/hwui/apex/jni_runtime.cpp
index 35c997d80b61..506c57802e32 100644
--- a/core/jni/android/graphics/apex/jni_runtime.cpp
+++ b/libs/hwui/apex/jni_runtime.cpp
@@ -59,7 +59,6 @@ extern int register_android_graphics_Path(JNIEnv* env);
 extern int register_android_graphics_PathMeasure(JNIEnv* env);
 extern int register_android_graphics_Picture(JNIEnv*);
 extern int register_android_graphics_Region(JNIEnv* env);
-extern int register_android_graphics_SurfaceTexture(JNIEnv* env);
 extern int register_android_graphics_animation_NativeInterpolatorFactory(JNIEnv* env);
 extern int register_android_graphics_animation_RenderNodeAnimator(JNIEnv* env);
 extern int register_android_graphics_drawable_AnimatedVectorDrawable(JNIEnv* env);
@@ -122,7 +121,6 @@ static const RegJNIRec gRegJNI[] = {
     REG_JNI(register_android_graphics_Picture),
     REG_JNI(register_android_graphics_Region),
     REG_JNI(register_android_graphics_Shader),
-    REG_JNI(register_android_graphics_SurfaceTexture),
     REG_JNI(register_android_graphics_Typeface),
     REG_JNI(register_android_graphics_YuvImage),
     REG_JNI(register_android_graphics_animation_NativeInterpolatorFactory),
diff --git a/core/jni/android/graphics/apex/renderthread.cpp b/libs/hwui/apex/renderthread.cpp
index 5d26afe7a2ab..5d26afe7a2ab 100644
--- a/core/jni/android/graphics/apex/renderthread.cpp
+++ b/libs/hwui/apex/renderthread.cpp
diff --git a/core/jni/android/graphics/AnimatedImageDrawable.cpp b/libs/hwui/jni/AnimatedImageDrawable.cpp
index 6c2a5a3f3fcc..6c2a5a3f3fcc 100644
--- a/core/jni/android/graphics/AnimatedImageDrawable.cpp
+++ b/libs/hwui/jni/AnimatedImageDrawable.cpp
diff --git a/core/jni/android/graphics/Bitmap.cpp b/libs/hwui/jni/Bitmap.cpp
index 130322aaaa45..130322aaaa45 100755
--- a/core/jni/android/graphics/Bitmap.cpp
+++ b/libs/hwui/jni/Bitmap.cpp
diff --git a/core/jni/android/graphics/Bitmap.h b/libs/hwui/jni/Bitmap.h
index 73eca3aa8ef8..73eca3aa8ef8 100644
--- a/core/jni/android/graphics/Bitmap.h
+++ b/libs/hwui/jni/Bitmap.h
diff --git a/core/jni/android/graphics/BitmapFactory.cpp b/libs/hwui/jni/BitmapFactory.cpp
index adedffdd731c..adedffdd731c 100644
--- a/core/jni/android/graphics/BitmapFactory.cpp
+++ b/libs/hwui/jni/BitmapFactory.cpp
diff --git a/core/jni/android/graphics/BitmapFactory.h b/libs/hwui/jni/BitmapFactory.h
index 45bffc44967d..45bffc44967d 100644
--- a/core/jni/android/graphics/BitmapFactory.h
+++ b/libs/hwui/jni/BitmapFactory.h
diff --git a/core/jni/android/graphics/BitmapRegionDecoder.cpp b/libs/hwui/jni/BitmapRegionDecoder.cpp
index 06b4ff849097..06b4ff849097 100644
--- a/core/jni/android/graphics/BitmapRegionDecoder.cpp
+++ b/libs/hwui/jni/BitmapRegionDecoder.cpp
diff --git a/core/jni/android/graphics/ByteBufferStreamAdaptor.cpp b/libs/hwui/jni/ByteBufferStreamAdaptor.cpp
index d443fd8cdf14..d443fd8cdf14 100644
--- a/core/jni/android/graphics/ByteBufferStreamAdaptor.cpp
+++ b/libs/hwui/jni/ByteBufferStreamAdaptor.cpp
diff --git a/core/jni/android/graphics/ByteBufferStreamAdaptor.h b/libs/hwui/jni/ByteBufferStreamAdaptor.h
index 367a48fad9b9..367a48fad9b9 100644
--- a/core/jni/android/graphics/ByteBufferStreamAdaptor.h
+++ b/libs/hwui/jni/ByteBufferStreamAdaptor.h
diff --git a/core/jni/android/graphics/Camera.cpp b/libs/hwui/jni/Camera.cpp
index da954972ab57..da954972ab57 100644
--- a/core/jni/android/graphics/Camera.cpp
+++ b/libs/hwui/jni/Camera.cpp
diff --git a/core/jni/android/graphics/CanvasProperty.cpp b/libs/hwui/jni/CanvasProperty.cpp
index c841d6a5125a..c841d6a5125a 100644
--- a/core/jni/android/graphics/CanvasProperty.cpp
+++ b/libs/hwui/jni/CanvasProperty.cpp
diff --git a/core/jni/android/graphics/ColorFilter.cpp b/libs/hwui/jni/ColorFilter.cpp
index 164d35f46a47..164d35f46a47 100644
--- a/core/jni/android/graphics/ColorFilter.cpp
+++ b/libs/hwui/jni/ColorFilter.cpp
diff --git a/core/jni/android/graphics/CreateJavaOutputStreamAdaptor.cpp b/libs/hwui/jni/CreateJavaOutputStreamAdaptor.cpp
index 39483b55992b..39483b55992b 100644
--- a/core/jni/android/graphics/CreateJavaOutputStreamAdaptor.cpp
+++ b/libs/hwui/jni/CreateJavaOutputStreamAdaptor.cpp
diff --git a/core/jni/android/graphics/CreateJavaOutputStreamAdaptor.h b/libs/hwui/jni/CreateJavaOutputStreamAdaptor.h
index fccd4717c4b7..fccd4717c4b7 100644
--- a/core/jni/android/graphics/CreateJavaOutputStreamAdaptor.h
+++ b/libs/hwui/jni/CreateJavaOutputStreamAdaptor.h
diff --git a/core/jni/android/graphics/FontFamily.cpp b/libs/hwui/jni/FontFamily.cpp
index 0fd9cc7e9989..0fd9cc7e9989 100644
--- a/core/jni/android/graphics/FontFamily.cpp
+++ b/libs/hwui/jni/FontFamily.cpp
diff --git a/core/jni/android/graphics/FontUtils.cpp b/libs/hwui/jni/FontUtils.cpp
index 0cf61b9ade89..0cf61b9ade89 100644
--- a/core/jni/android/graphics/FontUtils.cpp
+++ b/libs/hwui/jni/FontUtils.cpp
diff --git a/core/jni/android/graphics/FontUtils.h b/libs/hwui/jni/FontUtils.h
index b36b4e60e33a..b36b4e60e33a 100644
--- a/core/jni/android/graphics/FontUtils.h
+++ b/libs/hwui/jni/FontUtils.h
diff --git a/core/jni/android/graphics/GIFMovie.cpp b/libs/hwui/jni/GIFMovie.cpp
index f84a4bd09073..f84a4bd09073 100644
--- a/core/jni/android/graphics/GIFMovie.cpp
+++ b/libs/hwui/jni/GIFMovie.cpp
diff --git a/core/jni/android/graphics/Graphics.cpp b/libs/hwui/jni/Graphics.cpp
index 38fb8bdc1f7a..38fb8bdc1f7a 100644
--- a/core/jni/android/graphics/Graphics.cpp
+++ b/libs/hwui/jni/Graphics.cpp
diff --git a/core/jni/android/graphics/GraphicsJNI.h b/libs/hwui/jni/GraphicsJNI.h
index 1e497654f18d..1e497654f18d 100644
--- a/core/jni/android/graphics/GraphicsJNI.h
+++ b/libs/hwui/jni/GraphicsJNI.h
diff --git a/core/jni/android/graphics/GraphicsStatsService.cpp b/libs/hwui/jni/GraphicsStatsService.cpp
index ef0aacc4d9ec..ef0aacc4d9ec 100644
--- a/core/jni/android/graphics/GraphicsStatsService.cpp
+++ b/libs/hwui/jni/GraphicsStatsService.cpp
diff --git a/core/jni/android/graphics/ImageDecoder.cpp b/libs/hwui/jni/ImageDecoder.cpp
index e17e057d75c7..e17e057d75c7 100644
--- a/core/jni/android/graphics/ImageDecoder.cpp
+++ b/libs/hwui/jni/ImageDecoder.cpp
diff --git a/core/jni/android/graphics/ImageDecoder.h b/libs/hwui/jni/ImageDecoder.h
index 8a7fa79503ba..8a7fa79503ba 100644
--- a/core/jni/android/graphics/ImageDecoder.h
+++ b/libs/hwui/jni/ImageDecoder.h
diff --git a/core/jni/android/graphics/Interpolator.cpp b/libs/hwui/jni/Interpolator.cpp
index fa28359281db..fa28359281db 100644
--- a/core/jni/android/graphics/Interpolator.cpp
+++ b/libs/hwui/jni/Interpolator.cpp
diff --git a/core/jni/android/graphics/MaskFilter.cpp b/libs/hwui/jni/MaskFilter.cpp
index 33d346f5d379..33d346f5d379 100644
--- a/core/jni/android/graphics/MaskFilter.cpp
+++ b/libs/hwui/jni/MaskFilter.cpp
diff --git a/core/jni/android/graphics/Movie.cpp b/libs/hwui/jni/Movie.cpp
index 4c10a85c8257..4c10a85c8257 100644
--- a/core/jni/android/graphics/Movie.cpp
+++ b/libs/hwui/jni/Movie.cpp
diff --git a/core/jni/android/graphics/Movie.h b/libs/hwui/jni/Movie.h
index 736890d5215e..736890d5215e 100644
--- a/core/jni/android/graphics/Movie.h
+++ b/libs/hwui/jni/Movie.h
diff --git a/core/jni/android/graphics/MovieImpl.cpp b/libs/hwui/jni/MovieImpl.cpp
index ae9e04e617b0..ae9e04e617b0 100644
--- a/core/jni/android/graphics/MovieImpl.cpp
+++ b/libs/hwui/jni/MovieImpl.cpp
diff --git a/core/jni/android/graphics/NinePatch.cpp b/libs/hwui/jni/NinePatch.cpp
index 15f951688d43..15f951688d43 100644
--- a/core/jni/android/graphics/NinePatch.cpp
+++ b/libs/hwui/jni/NinePatch.cpp
diff --git a/core/jni/android/graphics/NinePatchPeeker.cpp b/libs/hwui/jni/NinePatchPeeker.cpp
index 9171fc687276..9171fc687276 100644
--- a/core/jni/android/graphics/NinePatchPeeker.cpp
+++ b/libs/hwui/jni/NinePatchPeeker.cpp
diff --git a/core/jni/android/graphics/NinePatchPeeker.h b/libs/hwui/jni/NinePatchPeeker.h
index e4e58dda4783..e4e58dda4783 100644
--- a/core/jni/android/graphics/NinePatchPeeker.h
+++ b/libs/hwui/jni/NinePatchPeeker.h
diff --git a/core/jni/android/graphics/Paint.cpp b/libs/hwui/jni/Paint.cpp
index 8e1bc8489baa..8e1bc8489baa 100644
--- a/core/jni/android/graphics/Paint.cpp
+++ b/libs/hwui/jni/Paint.cpp
diff --git a/core/jni/android/graphics/PaintFilter.cpp b/libs/hwui/jni/PaintFilter.cpp
index 4fe9140572d3..4fe9140572d3 100644
--- a/core/jni/android/graphics/PaintFilter.cpp
+++ b/libs/hwui/jni/PaintFilter.cpp
diff --git a/core/jni/android/graphics/Path.cpp b/libs/hwui/jni/Path.cpp
index 481445258e3c..481445258e3c 100644
--- a/core/jni/android/graphics/Path.cpp
+++ b/libs/hwui/jni/Path.cpp
diff --git a/core/jni/android/graphics/PathEffect.cpp b/libs/hwui/jni/PathEffect.cpp
index a4992de72ff6..a4992de72ff6 100644
--- a/core/jni/android/graphics/PathEffect.cpp
+++ b/libs/hwui/jni/PathEffect.cpp
diff --git a/core/jni/android/graphics/PathMeasure.cpp b/libs/hwui/jni/PathMeasure.cpp
index 70e528d4be6f..70e528d4be6f 100644
--- a/core/jni/android/graphics/PathMeasure.cpp
+++ b/libs/hwui/jni/PathMeasure.cpp
diff --git a/core/jni/android/graphics/Picture.cpp b/libs/hwui/jni/Picture.cpp
index d1b952130e88..d1b952130e88 100644
--- a/core/jni/android/graphics/Picture.cpp
+++ b/libs/hwui/jni/Picture.cpp
diff --git a/core/jni/android/graphics/Picture.h b/libs/hwui/jni/Picture.h
index 536f651473a9..536f651473a9 100644
--- a/core/jni/android/graphics/Picture.h
+++ b/libs/hwui/jni/Picture.h
diff --git a/core/jni/android/graphics/Region.cpp b/libs/hwui/jni/Region.cpp
index 87662f713449..87662f713449 100644
--- a/core/jni/android/graphics/Region.cpp
+++ b/libs/hwui/jni/Region.cpp
diff --git a/core/jni/android/graphics/RtlProperties.h b/libs/hwui/jni/RtlProperties.h
index 907dd59b6e68..907dd59b6e68 100644
--- a/core/jni/android/graphics/RtlProperties.h
+++ b/libs/hwui/jni/RtlProperties.h
diff --git a/core/jni/android/graphics/Shader.cpp b/libs/hwui/jni/Shader.cpp
index f5e2a5244416..f5e2a5244416 100644
--- a/core/jni/android/graphics/Shader.cpp
+++ b/libs/hwui/jni/Shader.cpp
diff --git a/core/jni/android/graphics/TEST_MAPPING b/libs/hwui/jni/TEST_MAPPING
index 10bd0ee906fd..10bd0ee906fd 100644
--- a/core/jni/android/graphics/TEST_MAPPING
+++ b/libs/hwui/jni/TEST_MAPPING
diff --git a/core/jni/android/graphics/Typeface.cpp b/libs/hwui/jni/Typeface.cpp
index 4ce56ba7444f..4ce56ba7444f 100644
--- a/core/jni/android/graphics/Typeface.cpp
+++ b/libs/hwui/jni/Typeface.cpp
diff --git a/core/jni/android/graphics/Utils.cpp b/libs/hwui/jni/Utils.cpp
index 17c194d04f84..17c194d04f84 100644
--- a/core/jni/android/graphics/Utils.cpp
+++ b/libs/hwui/jni/Utils.cpp
diff --git a/core/jni/android/graphics/Utils.h b/libs/hwui/jni/Utils.h
index 89255177ba2e..89255177ba2e 100644
--- a/core/jni/android/graphics/Utils.h
+++ b/libs/hwui/jni/Utils.h
diff --git a/core/jni/android/graphics/YuvToJpegEncoder.cpp b/libs/hwui/jni/YuvToJpegEncoder.cpp
index 09adc824e520..09adc824e520 100644
--- a/core/jni/android/graphics/YuvToJpegEncoder.cpp
+++ b/libs/hwui/jni/YuvToJpegEncoder.cpp
diff --git a/core/jni/android/graphics/YuvToJpegEncoder.h b/libs/hwui/jni/YuvToJpegEncoder.h
index 7e7b935df276..7e7b935df276 100644
--- a/core/jni/android/graphics/YuvToJpegEncoder.h
+++ b/libs/hwui/jni/YuvToJpegEncoder.h
diff --git a/core/jni/android_graphics_Canvas.cpp b/libs/hwui/jni/android_graphics_Canvas.cpp
index 0ad3339ee05f..0ad3339ee05f 100644
--- a/core/jni/android_graphics_Canvas.cpp
+++ b/libs/hwui/jni/android_graphics_Canvas.cpp
diff --git a/core/jni/android_graphics_ColorSpace.cpp b/libs/hwui/jni/android_graphics_ColorSpace.cpp
index 7648fd021d18..7648fd021d18 100644
--- a/core/jni/android_graphics_ColorSpace.cpp
+++ b/libs/hwui/jni/android_graphics_ColorSpace.cpp
diff --git a/core/jni/android_view_DisplayListCanvas.cpp b/libs/hwui/jni/android_graphics_DisplayListCanvas.cpp
index 9907da5a2e68..9907da5a2e68 100644
--- a/core/jni/android_view_DisplayListCanvas.cpp
+++ b/libs/hwui/jni/android_graphics_DisplayListCanvas.cpp
diff --git a/core/jni/android_view_ThreadedRenderer.cpp b/libs/hwui/jni/android_graphics_HardwareRenderer.cpp
index 93449ffeae1b..93449ffeae1b 100644
--- a/core/jni/android_view_ThreadedRenderer.cpp
+++ b/libs/hwui/jni/android_graphics_HardwareRenderer.cpp
diff --git a/core/jni/android_graphics_HardwareRendererObserver.cpp b/libs/hwui/jni/android_graphics_HardwareRendererObserver.cpp
index 89b77b0b069a..89b77b0b069a 100644
--- a/core/jni/android_graphics_HardwareRendererObserver.cpp
+++ b/libs/hwui/jni/android_graphics_HardwareRendererObserver.cpp
diff --git a/core/jni/android_graphics_HardwareRendererObserver.h b/libs/hwui/jni/android_graphics_HardwareRendererObserver.h
index 62111fd7d7a1..62111fd7d7a1 100644
--- a/core/jni/android_graphics_HardwareRendererObserver.h
+++ b/libs/hwui/jni/android_graphics_HardwareRendererObserver.h
diff --git a/core/jni/android/graphics/Matrix.cpp b/libs/hwui/jni/android_graphics_Matrix.cpp
index 13369763e0cf..13369763e0cf 100644
--- a/core/jni/android/graphics/Matrix.cpp
+++ b/libs/hwui/jni/android_graphics_Matrix.cpp
diff --git a/core/jni/android/graphics/Matrix.h b/libs/hwui/jni/android_graphics_Matrix.h
index fe90d2ef945d..fe90d2ef945d 100644
--- a/core/jni/android/graphics/Matrix.h
+++ b/libs/hwui/jni/android_graphics_Matrix.h
diff --git a/core/jni/android_graphics_Picture.cpp b/libs/hwui/jni/android_graphics_Picture.cpp
index 1d085e5ccc49..1d085e5ccc49 100644
--- a/core/jni/android_graphics_Picture.cpp
+++ b/libs/hwui/jni/android_graphics_Picture.cpp
diff --git a/core/jni/android_view_RenderNode.cpp b/libs/hwui/jni/android_graphics_RenderNode.cpp
index a8246c7d84b7..a8246c7d84b7 100644
--- a/core/jni/android_view_RenderNode.cpp
+++ b/libs/hwui/jni/android_graphics_RenderNode.cpp
diff --git a/core/jni/android_view_TextureLayer.cpp b/libs/hwui/jni/android_graphics_TextureLayer.cpp
index 40f618025f99..40f618025f99 100644
--- a/core/jni/android_view_TextureLayer.cpp
+++ b/libs/hwui/jni/android_graphics_TextureLayer.cpp
diff --git a/core/jni/android_graphics_animation_NativeInterpolatorFactory.cpp b/libs/hwui/jni/android_graphics_animation_NativeInterpolatorFactory.cpp
index 2073ac2d24be..2073ac2d24be 100644
--- a/core/jni/android_graphics_animation_NativeInterpolatorFactory.cpp
+++ b/libs/hwui/jni/android_graphics_animation_NativeInterpolatorFactory.cpp
diff --git a/core/jni/android_graphics_animation_RenderNodeAnimator.cpp b/libs/hwui/jni/android_graphics_animation_RenderNodeAnimator.cpp
index 878d4fc13f6d..878d4fc13f6d 100644
--- a/core/jni/android_graphics_animation_RenderNodeAnimator.cpp
+++ b/libs/hwui/jni/android_graphics_animation_RenderNodeAnimator.cpp
diff --git a/core/jni/android_graphics_drawable_AnimatedVectorDrawable.cpp b/libs/hwui/jni/android_graphics_drawable_AnimatedVectorDrawable.cpp
index b6b53666e26e..b6b53666e26e 100644
--- a/core/jni/android_graphics_drawable_AnimatedVectorDrawable.cpp
+++ b/libs/hwui/jni/android_graphics_drawable_AnimatedVectorDrawable.cpp
diff --git a/core/jni/android_graphics_drawable_VectorDrawable.cpp b/libs/hwui/jni/android_graphics_drawable_VectorDrawable.cpp
index 58a2379a6999..58a2379a6999 100644
--- a/core/jni/android_graphics_drawable_VectorDrawable.cpp
+++ b/libs/hwui/jni/android_graphics_drawable_VectorDrawable.cpp
diff --git a/core/jni/android_nio_utils.cpp b/libs/hwui/jni/android_nio_utils.cpp
index 1e6d49e49b72..1e6d49e49b72 100644
--- a/core/jni/android_nio_utils.cpp
+++ b/libs/hwui/jni/android_nio_utils.cpp
diff --git a/core/jni/android_nio_utils.h b/libs/hwui/jni/android_nio_utils.h
index 4aaa0a78c276..4aaa0a78c276 100644
--- a/core/jni/android_nio_utils.h
+++ b/libs/hwui/jni/android_nio_utils.h
diff --git a/core/jni/android_util_PathParser.cpp b/libs/hwui/jni/android_util_PathParser.cpp
index 10efb95100ac..10efb95100ac 100644
--- a/core/jni/android_util_PathParser.cpp
+++ b/libs/hwui/jni/android_util_PathParser.cpp
diff --git a/core/jni/android/graphics/fonts/Font.cpp b/libs/hwui/jni/fonts/Font.cpp
index bfb9bae45f0c..bfb9bae45f0c 100644
--- a/core/jni/android/graphics/fonts/Font.cpp
+++ b/libs/hwui/jni/fonts/Font.cpp
diff --git a/core/jni/android/graphics/fonts/FontFamily.cpp b/libs/hwui/jni/fonts/FontFamily.cpp
index b0d10c356a9b..b0d10c356a9b 100644
--- a/core/jni/android/graphics/fonts/FontFamily.cpp
+++ b/libs/hwui/jni/fonts/FontFamily.cpp
diff --git a/core/jni/android/graphics/pdf/PdfDocument.cpp b/libs/hwui/jni/pdf/PdfDocument.cpp
index 5f67d3008f45..5f67d3008f45 100644
--- a/core/jni/android/graphics/pdf/PdfDocument.cpp
+++ b/libs/hwui/jni/pdf/PdfDocument.cpp
diff --git a/core/jni/android/graphics/pdf/PdfEditor.cpp b/libs/hwui/jni/pdf/PdfEditor.cpp
index 10c30260d7e3..10c30260d7e3 100644
--- a/core/jni/android/graphics/pdf/PdfEditor.cpp
+++ b/libs/hwui/jni/pdf/PdfEditor.cpp
diff --git a/core/jni/android/graphics/pdf/PdfRenderer.cpp b/libs/hwui/jni/pdf/PdfRenderer.cpp
index 761830b0e97c..761830b0e97c 100644
--- a/core/jni/android/graphics/pdf/PdfRenderer.cpp
+++ b/libs/hwui/jni/pdf/PdfRenderer.cpp
diff --git a/core/jni/android/graphics/pdf/PdfUtils.cpp b/libs/hwui/jni/pdf/PdfUtils.cpp
index 36355ebbefc4..36355ebbefc4 100644
--- a/core/jni/android/graphics/pdf/PdfUtils.cpp
+++ b/libs/hwui/jni/pdf/PdfUtils.cpp
diff --git a/core/jni/android/graphics/pdf/PdfUtils.h b/libs/hwui/jni/pdf/PdfUtils.h
index 65327382e899..65327382e899 100644
--- a/core/jni/android/graphics/pdf/PdfUtils.h
+++ b/libs/hwui/jni/pdf/PdfUtils.h
diff --git a/core/jni/android/graphics/text/LineBreaker.cpp b/libs/hwui/jni/text/LineBreaker.cpp
index 8dae6558bb0d..8dae6558bb0d 100644
--- a/core/jni/android/graphics/text/LineBreaker.cpp
+++ b/libs/hwui/jni/text/LineBreaker.cpp
diff --git a/core/jni/android/graphics/text/MeasuredText.cpp b/libs/hwui/jni/text/MeasuredText.cpp
index 3b5ecbcd1d35..3b5ecbcd1d35 100644
--- a/core/jni/android/graphics/text/MeasuredText.cpp
+++ b/libs/hwui/jni/text/MeasuredText.cpp