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

Commit 0019552d authored by Brett Chabot's avatar Brett Chabot
Browse files

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
parent 1e3cd9a0

core/jni/Android.bp

+28 −2
Original line number Original line Diff line number Diff line 


cc_library_shared {

cc_library_shared {

    name: "libandroid_runtime",

    name: "libandroid_runtime",

    host_supported: true,

    host_supported: true,
@@ -286,8 +285,9 @@ cc_library_shared { 
            ],

            ],

            include_dirs: [

            include_dirs: [

                "external/vulkan-headers/include",

                "external/vulkan-headers/include",

                "frameworks/native/libs/math/include",

                "frameworks/native/libs/nativebase/include",

                "frameworks/native/libs/nativebase/include",

                "frameworks/native/libs/nativewindow/include"

                "frameworks/native/libs/nativewindow/include",

            ],

            ],

            shared_libs: [

            shared_libs: [

                "libicui18n",

                "libicui18n",
@@ -303,10 +303,36 @@ cc_library_shared { 
        linux_glibc: {

        linux_glibc: {

            srcs: [

            srcs: [

                "android_content_res_ApkAssets.cpp",

                "android_content_res_ApkAssets.cpp",

                "android_hardware_input_InputApplicationHandle.cpp",

                "android_os_MessageQueue.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_AssetManager.cpp",

                "android_util_Binder.cpp",



                "android_util_FileObserver.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: {

        windows: {

            enabled: true,

            enabled: true,

core/jni/android_util_Binder.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -40,6 +40,7 @@ 
#include <binder/Stability.h>

#include <binder/Stability.h>

#include <binderthreadstate/CallerUtils.h>

#include <binderthreadstate/CallerUtils.h>

#include <cutils/atomic.h>

#include <cutils/atomic.h>

#include <cutils/threads.h>

#include <log/log.h>

#include <log/log.h>

#include <utils/KeyedVector.h>

#include <utils/KeyedVector.h>

#include <utils/List.h>

#include <utils/List.h>

libs/hostgraphics/Android.bp

+3 −0
Original line number Original line Diff line number Diff line
@@ -7,6 +7,8 @@ cc_library_host_static { 




    static_libs: [

    static_libs: [

        "libbase",

        "libbase",

        "libmath",

        "libutils",

    ],

    ],





    srcs: [

    srcs: [
@@ -24,6 +26,7 @@ cc_library_host_static { 
        "frameworks/native/libs/nativebase/include",

        "frameworks/native/libs/nativebase/include",

        "frameworks/native/libs/nativewindow/include",

        "frameworks/native/libs/nativewindow/include",

        "frameworks/native/libs/arect/include",

        "frameworks/native/libs/arect/include",

        "frameworks/native/libs/ui/include_private",

    ],

    ],

    export_include_dirs: ["."],

    export_include_dirs: ["."],

tools/validatekeymaps/Android.bp

+1 −0
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ cc_binary_host { 




    static_libs: [

    static_libs: [

        "libbase",

        "libbase",

        "libbinder",

        "libinput",

        "libinput",

        "libutils",

        "libutils",

        "libcutils",

        "libcutils",