diff options
| author | Brett Chabot <brettchabot@google.com> | 2020-09-09 13:52:20 -0700 |
|---|---|---|
| committer | Brett Chabot <brettchabot@google.com> | 2020-10-28 09:29:28 -0700 |
| commit | 0019552d446f43a892d8aba29ee991dc08410024 (patch) | |
| tree | 0e059a8464366d68f96a48ef8511b9b88c9d1d12 | |
| parent | 1e3cd9a07dcb79116f6eaa8acdf76cf9a356416d (diff) | |
Build input and binder JNI bindings for linux host.
And add Transform.cpp to libhostgraphics to support this.
Test: m libandroid_runtime
Change-Id: I848b3e1ef79cb3f5cf8477c49eb50d4ed701a4a8
| -rw-r--r-- | core/jni/Android.bp | 30 | ||||
| -rw-r--r-- | core/jni/android_util_Binder.cpp | 1 | ||||
| -rw-r--r-- | libs/hostgraphics/Android.bp | 3 | ||||
| -rw-r--r-- | tools/validatekeymaps/Android.bp | 1 |
4 files changed, 33 insertions, 2 deletions
diff --git a/core/jni/Android.bp b/core/jni/Android.bp index 4f97975838d5..661bbed8abcb 100644 --- a/core/jni/Android.bp +++ b/core/jni/Android.bp @@ -1,4 +1,3 @@ - cc_library_shared { name: "libandroid_runtime", host_supported: true, @@ -286,8 +285,9 @@ cc_library_shared { ], include_dirs: [ "external/vulkan-headers/include", + "frameworks/native/libs/math/include", "frameworks/native/libs/nativebase/include", - "frameworks/native/libs/nativewindow/include" + "frameworks/native/libs/nativewindow/include", ], shared_libs: [ "libicui18n", @@ -303,10 +303,36 @@ cc_library_shared { linux_glibc: { srcs: [ "android_content_res_ApkAssets.cpp", + "android_hardware_input_InputApplicationHandle.cpp", "android_os_MessageQueue.cpp", + "android_os_Parcel.cpp", + + "android_view_KeyCharacterMap.cpp", + "android_view_KeyEvent.cpp", + "android_view_InputChannel.cpp", + "android_view_InputDevice.cpp", + "android_view_InputEventReceiver.cpp", + "android_view_InputEventSender.cpp", + "android_view_MotionEvent.cpp", + "android_view_VelocityTracker.cpp", + "android_view_VerifiedKeyEvent.cpp", + "android_view_VerifiedMotionEvent.cpp", + "android_util_AssetManager.cpp", + "android_util_Binder.cpp", + "android_util_FileObserver.cpp", ], + static_libs: [ + "libinput", + "libbinderthreadstateutils", + ], + shared_libs: [ + // libbinder needs to be shared since it has global state + // (e.g. gDefaultServiceManager) + "libbinder", + "libhidlbase", // libhwbinder is in here + ], }, windows: { enabled: true, diff --git a/core/jni/android_util_Binder.cpp b/core/jni/android_util_Binder.cpp index 32b8fa61c8a0..a3cb4c076593 100644 --- a/core/jni/android_util_Binder.cpp +++ b/core/jni/android_util_Binder.cpp @@ -40,6 +40,7 @@ #include <binder/Stability.h> #include <binderthreadstate/CallerUtils.h> #include <cutils/atomic.h> +#include <cutils/threads.h> #include <log/log.h> #include <utils/KeyedVector.h> #include <utils/List.h> diff --git a/libs/hostgraphics/Android.bp b/libs/hostgraphics/Android.bp index 9d83e491fdc1..3a99d41448f2 100644 --- a/libs/hostgraphics/Android.bp +++ b/libs/hostgraphics/Android.bp @@ -7,6 +7,8 @@ cc_library_host_static { static_libs: [ "libbase", + "libmath", + "libutils", ], srcs: [ @@ -24,6 +26,7 @@ cc_library_host_static { "frameworks/native/libs/nativebase/include", "frameworks/native/libs/nativewindow/include", "frameworks/native/libs/arect/include", + "frameworks/native/libs/ui/include_private", ], export_include_dirs: ["."], diff --git a/tools/validatekeymaps/Android.bp b/tools/validatekeymaps/Android.bp index 61ce44c3b5b9..2759e29d1620 100644 --- a/tools/validatekeymaps/Android.bp +++ b/tools/validatekeymaps/Android.bp @@ -16,6 +16,7 @@ cc_binary_host { static_libs: [ "libbase", + "libbinder", "libinput", "libutils", "libcutils", |