commit 5ee1d66486ca638460c5edbd1fa0293b956c73e9
author Brett Chabot <brettchabot@google.com> Tue Jun 18 10:42:23 2019 -0700
committer Jerome Gaillard <jgaillard@google.com> Thu Jun 27 17:50:01 2019 +0100
tree ae5d53b4b3e99f1b0cbcd591cf9d9bfb48c61061
parent e7612ba65c3ee5b1f4841e6912df71f10d3b741f

Build and potentially register Trace for host.

Test: tools/test/simulated_device/ctesque/run_tests_host.sh
Change-Id: If8b715f49752bf0aedb0287a271e9f6d9f8a35e1

core/jni/Android.bp

diff --git a/core/jni/Android.bp b/core/jni/Android.bp
index 9d15696..94970cf 100644
--- a/core/jni/Android.bp
+++ b/core/jni/Android.bp
@@ -42,6 +42,7 @@
         "android_os_MessageQueue.cpp",
         "android_os_SystemClock.cpp",
         "android_os_SystemProperties.cpp",
+        "android_os_Trace.cpp",
         "android_util_Log.cpp",
         "android_util_PathParser.cpp",
         "android_view_DisplayListCanvas.cpp",
@@ -173,7 +174,6 @@
                 "android_os_Parcel.cpp",
                 "android_os_SELinux.cpp",
                 "android_os_SharedMemory.cpp",
-                "android_os_Trace.cpp",
                 "android_os_UEventObserver.cpp",
                 "android_os_VintfObject.cpp",
                 "android_os_VintfRuntimeInfo.cpp",

core/jni/LayoutlibLoader.cpp

diff --git a/core/jni/LayoutlibLoader.cpp b/core/jni/LayoutlibLoader.cpp
index 03f18f5..3316f2d 100644
--- a/core/jni/LayoutlibLoader.cpp
+++ b/core/jni/LayoutlibLoader.cpp
@@ -69,6 +69,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_Log(JNIEnv* env);
 extern int register_android_util_PathParser(JNIEnv* env);
 extern int register_android_view_RenderNode(JNIEnv* env);
@@ -118,6 +119,7 @@
     {"android.os.MessageQueue", REG_JNI(register_android_os_MessageQueue)},
     {"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.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)},