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

1 files changed, 0 insertions, 76 deletions

diff --git a/core/jni/LayoutlibLoader.cpp b/core/jni/LayoutlibLoader.cpp
index 7ee509b4ecb4..77c1a1097240 100644
--- a/core/jni/LayoutlibLoader.cpp
+++ b/core/jni/LayoutlibLoader.cpp
@@ -34,19 +34,6 @@ using namespace std;
 
 static JavaVM* javaVM;
 
-extern int register_android_graphics_Bitmap(JNIEnv*);
-extern int register_android_graphics_BitmapFactory(JNIEnv*);
-extern int register_android_graphics_ByteBufferStreamAdaptor(JNIEnv* env);
-extern int register_android_graphics_CreateJavaOutputStreamAdaptor(JNIEnv* env);
-extern int register_android_graphics_Graphics(JNIEnv* env);
-extern int register_android_graphics_ImageDecoder(JNIEnv*);
-extern int register_android_graphics_Interpolator(JNIEnv* env);
-extern int register_android_graphics_MaskFilter(JNIEnv* env);
-extern int register_android_graphics_NinePatch(JNIEnv*);
-extern int register_android_graphics_PathEffect(JNIEnv* env);
-extern int register_android_graphics_Shader(JNIEnv* env);
-extern int register_android_graphics_Typeface(JNIEnv* env);
-
 namespace android {
 
 extern int register_android_animation_PropertyValuesHolder(JNIEnv *env);
@@ -54,25 +41,6 @@ extern int register_android_content_AssetManager(JNIEnv* env);
 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_Canvas(JNIEnv* env);
-extern int register_android_graphics_ColorFilter(JNIEnv* env);
-extern int register_android_graphics_ColorSpace(JNIEnv* env);
-extern int register_android_graphics_DrawFilter(JNIEnv* env);
-extern int register_android_graphics_FontFamily(JNIEnv* env);
-extern int register_android_graphics_Matrix(JNIEnv* env);
-extern int register_android_graphics_Paint(JNIEnv* env);
-extern int register_android_graphics_Path(JNIEnv* env);
-extern int register_android_graphics_PathMeasure(JNIEnv* env);
-extern int register_android_graphics_Picture(JNIEnv* env);
-extern int register_android_graphics_Region(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);
-extern int register_android_graphics_drawable_VectorDrawable(JNIEnv* env);
-extern int register_android_graphics_fonts_Font(JNIEnv* env);
-extern int register_android_graphics_fonts_FontFamily(JNIEnv* env);
-extern int register_android_graphics_text_LineBreaker(JNIEnv* env);
-extern int register_android_graphics_text_MeasuredText(JNIEnv* env);
 extern int register_android_os_FileObserver(JNIEnv* env);
 extern int register_android_os_MessageQueue(JNIEnv* env);
 extern int register_android_os_SystemClock(JNIEnv* env);
@@ -81,10 +49,7 @@ extern int register_android_os_Trace(JNIEnv* env);
 extern int register_android_text_AndroidCharacter(JNIEnv* env);
 extern int register_android_util_EventLog(JNIEnv* env);
 extern int register_android_util_Log(JNIEnv* env);
-extern int register_android_util_PathParser(JNIEnv* env);
 extern int register_android_util_jar_StrictJarFile(JNIEnv* env);
-extern int register_android_view_RenderNode(JNIEnv* env);
-extern int register_android_view_DisplayListCanvas(JNIEnv* env);
 extern int register_com_android_internal_util_VirtualRefBasePtr(JNIEnv *env);
 
 #define REG_JNI(name)      { name }
@@ -103,46 +68,6 @@ static const std::unordered_map<std::string, RegJNIRec> gRegJNIMap = {
 #endif
         {"android.content.res.StringBlock", REG_JNI(register_android_content_StringBlock)},
         {"android.content.res.XmlBlock", REG_JNI(register_android_content_XmlBlock)},
-        {"android.graphics.Bitmap", REG_JNI(register_android_graphics_Bitmap)},
-        {"android.graphics.BitmapFactory", REG_JNI(register_android_graphics_BitmapFactory)},
-        {"android.graphics.ByteBufferStreamAdaptor",
-         REG_JNI(register_android_graphics_ByteBufferStreamAdaptor)},
-        {"android.graphics.Canvas", REG_JNI(register_android_graphics_Canvas)},
-        {"android.graphics.RenderNode", REG_JNI(register_android_view_RenderNode)},
-        {"android.graphics.ColorFilter", REG_JNI(register_android_graphics_ColorFilter)},
-        {"android.graphics.ColorSpace", REG_JNI(register_android_graphics_ColorSpace)},
-        {"android.graphics.CreateJavaOutputStreamAdaptor",
-         REG_JNI(register_android_graphics_CreateJavaOutputStreamAdaptor)},
-        {"android.graphics.DrawFilter", REG_JNI(register_android_graphics_DrawFilter)},
-        {"android.graphics.FontFamily", REG_JNI(register_android_graphics_FontFamily)},
-        {"android.graphics.Graphics", REG_JNI(register_android_graphics_Graphics)},
-        {"android.graphics.ImageDecoder", REG_JNI(register_android_graphics_ImageDecoder)},
-        {"android.graphics.Interpolator", REG_JNI(register_android_graphics_Interpolator)},
-        {"android.graphics.MaskFilter", REG_JNI(register_android_graphics_MaskFilter)},
-        {"android.graphics.Matrix", REG_JNI(register_android_graphics_Matrix)},
-        {"android.graphics.NinePatch", REG_JNI(register_android_graphics_NinePatch)},
-        {"android.graphics.Paint", REG_JNI(register_android_graphics_Paint)},
-        {"android.graphics.Path", REG_JNI(register_android_graphics_Path)},
-        {"android.graphics.PathEffect", REG_JNI(register_android_graphics_PathEffect)},
-        {"android.graphics.PathMeasure", REG_JNI(register_android_graphics_PathMeasure)},
-        {"android.graphics.Picture", REG_JNI(register_android_graphics_Picture)},
-        {"android.graphics.RecordingCanvas", REG_JNI(register_android_view_DisplayListCanvas)},
-        {"android.graphics.Region", REG_JNI(register_android_graphics_Region)},
-        {"android.graphics.Shader", REG_JNI(register_android_graphics_Shader)},
-        {"android.graphics.Typeface", REG_JNI(register_android_graphics_Typeface)},
-        {"android.graphics.animation.NativeInterpolatorFactory",
-         REG_JNI(register_android_graphics_animation_NativeInterpolatorFactory)},
-        {"android.graphics.animation.RenderNodeAnimator",
-         REG_JNI(register_android_graphics_animation_RenderNodeAnimator)},
-        {"android.graphics.drawable.AnimatedVectorDrawable",
-         REG_JNI(register_android_graphics_drawable_AnimatedVectorDrawable)},
-        {"android.graphics.drawable.VectorDrawable",
-         REG_JNI(register_android_graphics_drawable_VectorDrawable)},
-        {"android.graphics.fonts.Font", REG_JNI(register_android_graphics_fonts_Font)},
-        {"android.graphics.fonts.FontFamily", REG_JNI(register_android_graphics_fonts_FontFamily)},
-        {"android.graphics.text.LineBreaker", REG_JNI(register_android_graphics_text_LineBreaker)},
-        {"android.graphics.text.MeasuredText",
-         REG_JNI(register_android_graphics_text_MeasuredText)},
 #ifdef __linux__
         {"android.os.FileObserver", REG_JNI(register_android_os_FileObserver)},
         {"android.os.MessageQueue", REG_JNI(register_android_os_MessageQueue)},
@@ -153,7 +78,6 @@ static const std::unordered_map<std::string, RegJNIRec> gRegJNIMap = {
         {"android.text.AndroidCharacter", REG_JNI(register_android_text_AndroidCharacter)},
         {"android.util.EventLog", REG_JNI(register_android_util_EventLog)},
         {"android.util.Log", REG_JNI(register_android_util_Log)},
-        {"android.util.PathParser", REG_JNI(register_android_util_PathParser)},
         {"android.util.jar.StrictJarFile", REG_JNI(register_android_util_jar_StrictJarFile)},
         {"com.android.internal.util.VirtualRefBasePtr",
          REG_JNI(register_com_android_internal_util_VirtualRefBasePtr)},