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

Commit 07005276 authored by Jooyung Han's avatar Jooyung Han Committed by Automerger Merge Worker
Browse files

Merge "Move input processor service into VAPEX" into main am: e4067812 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2798415



Change-Id: I600d230d0359946a550c106eeb8d171b4bd6be8e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cd05b33e e4067812

input/processor/aidl/default/Android.bp

+35 −8
Original line number Diff line number Diff line
@@ -28,27 +28,54 @@ cc_library_static { 
    ],

}



filegroup {

prebuilt_etc {

    name: "android.hardware.input.processor.xml",

    srcs: ["android.hardware.input.processor.xml"],

    src: "android.hardware.input.processor.xml",

    sub_dir: "vintf",

    installable: false,

}



prebuilt_etc {

    name: "inputprocessor-default.rc",

    src: "inputprocessor-default.rc",

    installable: false,

}



cc_binary {

    name: "android.hardware.input.processor-service.example",

    relative_install_path: "hw",

    init_rc: ["inputprocessor-default.rc"],

    vintf_fragments: [":android.hardware.input.processor.xml"],

    vendor: true,

    installable: false, // installed in APEX



    stl: "c++_static",

    shared_libs: [

        "libbase",

        "libbinder_ndk",

        "liblog",

        "libutils",

        "android.hardware.input.common-V1-ndk",

        "android.hardware.input.processor-V1-ndk",

    ],

    static_libs: [

        "android.hardware.input.common-V1-ndk",

        "android.hardware.input.processor-V1-ndk",

        "libbase",

        "libinputprocessorexampleimpl",

        "libutils",

    ],

    srcs: ["main.cpp"],

}



apex {

    name: "com.android.hardware.input.processor",

    file_contexts: "apex_file_contexts",

    manifest: "apex_manifest.json",

    key: "com.android.hardware.key",

    certificate: ":com.android.hardware.certificate",

    updatable: false,

    vendor: true,



    binaries: [

        "android.hardware.input.processor-service.example",

    ],

    prebuilts: [

        "android.hardware.input.processor.xml",

        "inputprocessor-default.rc",

    ],

}

input/processor/aidl/default/apex_file_contexts

0 → 100644
+3 −0
Original line number Diff line number Diff line 
(/.*)?                                                          u:object_r:vendor_file:s0

/etc(/.*)?                                                      u:object_r:vendor_configs_file:s0

/bin/hw/android\.hardware\.input\.processor-service\.example    u:object_r:hal_input_processor_default_exec:s0

input/processor/aidl/default/apex_manifest.json

0 → 100644
+4 −0
Original line number Diff line number Diff line 
{

    "name": "com.android.hardware.input.processor",

    "version": 1

}
 
 No newline at end of file

input/processor/aidl/default/inputprocessor-default.rc

+1 −1
Original line number Diff line number Diff line 
service vendor.inputprocessor-default /vendor/bin/hw/android.hardware.input.processor-service.example

service vendor.inputprocessor-default /apex/com.android.hardware.input.processor/bin/hw/android.hardware.input.processor-service.example

    class hal

    user nobody

    group nobody
 
 No newline at end of file