diff options
| author | 2019-06-12 15:42:38 -0700 | |
|---|---|---|
| committer | 2019-06-27 17:49:12 +0100 | |
| commit | f6565d89365587b53d5186e9dcb0e3aee41bee51 (patch) | |
| tree | d293ae0059c0fb1a3d8b2dbe0b68b186882e820d | |
| parent | 96495db8696fb3ab2cecdde787d05d1851559171 (diff) | |
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
| -rw-r--r-- | core/jni/Android.bp | 2 | ||||
| -rw-r--r-- | core/jni/LayoutlibLoader.cpp | 2 | ||||
| -rw-r--r-- | core/jni/android_util_Log.cpp | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/core/jni/Android.bp b/core/jni/Android.bp index 779cb642cec1..a3c8a124701c 100644 --- a/core/jni/Android.bp +++ b/core/jni/Android.bp @@ -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", diff --git a/core/jni/LayoutlibLoader.cpp b/core/jni/LayoutlibLoader.cpp index a6b970469575..1750be9e824f 100644 --- a/core/jni/LayoutlibLoader.cpp +++ b/core/jni/LayoutlibLoader.cpp @@ -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)}, diff --git a/core/jni/android_util_Log.cpp b/core/jni/android_util_Log.cpp index a6adc88f53fb..ad35b7d39539 100644 --- a/core/jni/android_util_Log.cpp +++ b/core/jni/android_util_Log.cpp @@ -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> |