Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f014b46 authored by Brett Chabot's avatar Brett Chabot Committed by Jerome Gaillard
Browse files

Build native EventLog and XmlBlock for host linux. 

Test: tools/test/simulated_device/ctesque/run_tests_host.sh

Change-Id: Icc5b8563b62e601ff6f5b49e4c7b6493cd41d85b
parent 15c7bcd0

core/jni/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ cc_library_shared { 
        "android_os_SystemClock.cpp",

        "android_os_SystemProperties.cpp",

        "android_os_Trace.cpp",

        "android_util_EventLog.cpp",

        "android_util_Log.cpp",

        "android_util_PathParser.cpp",

        "android_view_DisplayListCanvas.cpp",
@@ -77,6 +78,7 @@ cc_library_shared { 
        "android/graphics/text/MeasuredText.cpp",

        "android_util_AssetManager.cpp",

        "android_util_StringBlock.cpp",

        "android_util_XmlBlock.cpp",

        "com_android_internal_util_VirtualRefBasePtr.cpp",

        "com_android_internal_view_animation_NativeInterpolatorFactoryHelper.cpp",

    ],
@@ -183,11 +185,9 @@ cc_library_shared { 
                "android_net_LocalSocketImpl.cpp",

                "android_net_NetUtils.cpp",

                "android_util_Binder.cpp",

                "android_util_EventLog.cpp",

                "android_util_StatsLog.cpp",

                "android_util_MemoryIntArray.cpp",

                "android_util_Process.cpp",

                "android_util_XmlBlock.cpp",

                "android_util_jar_StrictJarFile.cpp",

                "android/graphics/AnimatedImageDrawable.cpp",

                "android/graphics/Camera.cpp",

core/jni/LayoutlibLoader.cpp

+4 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ namespace android { 
extern int register_android_animation_PropertyValuesHolder(JNIEnv *env);

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);
@@ -73,6 +74,7 @@ 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_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);
@@ -91,6 +93,7 @@ static const std::unordered_map<std::string, RegJNIRec> gRegJNIMap = { 
    {"android.animation.PropertyValuesHolder", REG_JNI(register_android_animation_PropertyValuesHolder)},

    {"android.content.AssetManager", REG_JNI(register_android_content_AssetManager)},

    {"android.content.StringBlock", REG_JNI(register_android_content_StringBlock)},

    {"android.content.XmlBlock", REG_JNI(register_android_content_XmlBlock)},

    {"android.content.res.ApkAssets", REG_JNI(register_android_content_res_ApkAssets)},

    {"android.graphics.Bitmap", REG_JNI(register_android_graphics_Bitmap)},

    {"android.graphics.BitmapFactory", REG_JNI(register_android_graphics_BitmapFactory)},
@@ -126,6 +129,7 @@ static const std::unordered_map<std::string, RegJNIRec> 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.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)},

    {"com.android.internal.util.VirtualRefBasePtr", REG_JNI(register_com_android_internal_util_VirtualRefBasePtr)},