From 0e4893bb3a0a5b490c6d0f0b76e55a05ebe1fbc3 Mon Sep 17 00:00:00 2001 From: Jerome Gaillard Date: Tue, 1 Oct 2019 16:56:59 +0100 Subject: [PATCH] Compile more jni classes for host This adds android_text_AndroidCharacter.cpp and android_view_RenderNodeAnimator.cpp to the list of classes compiled for host target. Bug: 117921091 Test: lunch sdk && m libandroid_runtime Change-Id: I3f9dc5af4ecf5ae4b6f336a5c95d043222f72c38 --- core/jni/Android.bp | 4 ++-- core/jni/LayoutlibLoader.cpp | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/core/jni/Android.bp b/core/jni/Android.bp index 5a6ac932c46d6..9758673d678b8 100644 --- a/core/jni/Android.bp +++ b/core/jni/Android.bp @@ -36,10 +36,12 @@ cc_library_shared { "android_os_SystemClock.cpp", "android_os_SystemProperties.cpp", "android_os_Trace.cpp", + "android_text_AndroidCharacter.cpp", "android_util_EventLog.cpp", "android_util_Log.cpp", "android_util_StringBlock.cpp", "android_util_XmlBlock.cpp", + "android_view_RenderNodeAnimator.cpp", "com_android_internal_util_VirtualRefBasePtr.cpp", "com_android_internal_view_animation_NativeInterpolatorFactoryHelper.cpp", ], @@ -117,14 +119,12 @@ cc_library_shared { "android_view_KeyEvent.cpp", "android_view_MotionEvent.cpp", "android_view_PointerIcon.cpp", - "android_view_RenderNodeAnimator.cpp", "android_view_Surface.cpp", "android_view_SurfaceControl.cpp", "android_graphics_BLASTBufferQueue.cpp", "android_view_SurfaceSession.cpp", "android_view_TextureView.cpp", "android_view_VelocityTracker.cpp", - "android_text_AndroidCharacter.cpp", "android_text_Hyphenator.cpp", "android_os_Debug.cpp", "android_os_GraphicsEnvironment.cpp", diff --git a/core/jni/LayoutlibLoader.cpp b/core/jni/LayoutlibLoader.cpp index 709e043a8db49..ca5bf621e8ef7 100644 --- a/core/jni/LayoutlibLoader.cpp +++ b/core/jni/LayoutlibLoader.cpp @@ -75,10 +75,12 @@ extern int register_android_os_MessageQueue(JNIEnv* env); extern int register_android_os_SystemClock(JNIEnv* env); extern int register_android_os_SystemProperties(JNIEnv* env); 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_view_RenderNode(JNIEnv* env); +extern int register_android_view_RenderNodeAnimator(JNIEnv* env); extern int register_android_view_DisplayListCanvas(JNIEnv* env); extern int register_com_android_internal_util_VirtualRefBasePtr(JNIEnv *env); extern int register_com_android_internal_view_animation_NativeInterpolatorFactoryHelper(JNIEnv *env); @@ -141,9 +143,11 @@ static const std::unordered_map gRegJNIMap = { {"android.os.SystemClock", REG_JNI(register_android_os_SystemClock)}, {"android.os.SystemProperties", REG_JNI(register_android_os_SystemProperties)}, {"android.os.Trace", REG_JNI(register_android_os_Trace)}, + {"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.view.RenderNodeAnimator", REG_JNI(register_android_view_RenderNodeAnimator)}, {"com.android.internal.util.VirtualRefBasePtr", REG_JNI(register_com_android_internal_util_VirtualRefBasePtr)}, {"com.android.internal.view.animation.NativeInterpolatorFactoryHelper",