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

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

Build native Log for host. 

Test: tools/test/simulated_device/ctesque/run_tests_host.sh
Test: tools/test/simulated_device/ctesque/run_tests_device.sh
Change-Id: I702d547d4e84ac69b39d2652792b06dcdefda2da
parent 96495db8

core/jni/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ cc_library_shared { 
        "android_nio_utils.cpp",

        "android_os_SystemClock.cpp",

        "android_os_SystemProperties.cpp",

        "android_util_Log.cpp",

        "android_util_PathParser.cpp",

        "android_view_DisplayListCanvas.cpp",

        "android_view_RenderNode.cpp",
@@ -181,7 +182,6 @@ cc_library_shared { 
                "android_util_AssetManager.cpp",

                "android_util_Binder.cpp",

                "android_util_EventLog.cpp",

                "android_util_Log.cpp",

                "android_util_StatsLog.cpp",

                "android_util_MemoryIntArray.cpp",

                "android_util_Process.cpp",

core/jni/LayoutlibLoader.cpp

+2 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ extern int register_android_graphics_text_LineBreaker(JNIEnv* env); 
extern int register_android_graphics_text_MeasuredText(JNIEnv* env);

extern int register_android_os_SystemClock(JNIEnv* env);

extern int register_android_os_SystemProperties(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_DisplayListCanvas(JNIEnv* env);
@@ -115,6 +116,7 @@ static const std::unordered_map<std::string, RegJNIRec> gRegJNIMap = { 
    {"android.graphics.text.MeasuredText", REG_JNI(register_android_graphics_text_MeasuredText)},

    {"android.os.SystemClock", REG_JNI(register_android_os_SystemClock)},

    {"android.os.SystemProperties", REG_JNI(register_android_os_SystemProperties)},

    {"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)},

    {"com.android.internal.view.animation.NativeInterpolatorFactoryHelper", REG_JNI(register_com_android_internal_view_animation_NativeInterpolatorFactoryHelper)},

core/jni/android_util_Log.cpp

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 


#include <android-base/macros.h>

#include <assert.h>

#include <cutils/properties.h>

#include <log/log.h>               // For LOGGER_ENTRY_MAX_PAYLOAD.

#include <utils/Log.h>

#include <utils/String8.h>