summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Brett Chabot <brettchabot@google.com> 2019-06-12 14:05:42 -0700
committer Jerome Gaillard <jgaillard@google.com> 2019-06-27 17:49:32 +0100
commite7612ba65c3ee5b1f4841e6912df71f10d3b741f (patch)
tree1d0d921cce8b2f33f482bd378e20ad6b933d1b13
parentf6565d89365587b53d5186e9dcb0e3aee41bee51 (diff)
Build and register native MessageQueue for host.
Test: tools/test/simulated_device/ctesque/run_tests_host.sh Change-Id: If46d741e6727c012e69571c2a2441d0a06887030
-rw-r--r--core/jni/Android.bp2
-rw-r--r--core/jni/LayoutlibLoader.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/core/jni/Android.bp b/core/jni/Android.bp
index a3c8a124701c..9d156962aa5f 100644
--- a/core/jni/Android.bp
+++ b/core/jni/Android.bp
@@ -39,6 +39,7 @@ cc_library_shared {
"android_graphics_drawable_VectorDrawable.cpp",
"android_graphics_Picture.cpp",
"android_nio_utils.cpp",
+ "android_os_MessageQueue.cpp",
"android_os_SystemClock.cpp",
"android_os_SystemProperties.cpp",
"android_util_Log.cpp",
@@ -169,7 +170,6 @@ cc_library_shared {
"android_os_HwRemoteBinder.cpp",
"android_os_NativeHandle.cpp",
"android_os_MemoryFile.cpp",
- "android_os_MessageQueue.cpp",
"android_os_Parcel.cpp",
"android_os_SELinux.cpp",
"android_os_SharedMemory.cpp",
diff --git a/core/jni/LayoutlibLoader.cpp b/core/jni/LayoutlibLoader.cpp
index 1750be9e824f..03f18f50a347 100644
--- a/core/jni/LayoutlibLoader.cpp
+++ b/core/jni/LayoutlibLoader.cpp
@@ -66,6 +66,7 @@ extern int register_android_graphics_fonts_Font(JNIEnv* env);
extern int register_android_graphics_fonts_FontFamily(JNIEnv* env);
extern int register_android_graphics_text_LineBreaker(JNIEnv* env);
extern int register_android_graphics_text_MeasuredText(JNIEnv* env);
+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_util_Log(JNIEnv* env);
@@ -114,6 +115,7 @@ static const std::unordered_map<std::string, RegJNIRec> gRegJNIMap = {
{"android.graphics.fonts.FontFamily", REG_JNI(register_android_graphics_fonts_FontFamily)},
{"android.graphics.text.LineBreaker", REG_JNI(register_android_graphics_text_LineBreaker)},
{"android.graphics.text.MeasuredText", REG_JNI(register_android_graphics_text_MeasuredText)},
+ {"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.util.Log", REG_JNI(register_android_util_Log)},