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

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

Merge changes from topics "tetheroffload-hal-apex", "thermal-hal-apex" into... 

Merge changes from topics "tetheroffload-hal-apex", "thermal-hal-apex" into main am: 1f05f9d3 am: 49122f7d am: 288693a5 am: d1abd789

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



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

thermal/aidl/default/Android.bp

+32 −8
Original line number Diff line number Diff line
@@ -24,26 +24,50 @@ package { 
cc_binary {

    name: "android.hardware.thermal-service.example",

    relative_install_path: "hw",

    init_rc: [":android.hardware.thermal.example.rc"],

    vintf_fragments: [":android.hardware.thermal.example.xml"],

    vendor: true,

    shared_libs: [

    stl: "c++_static",

    static_libs: [

        "android.hardware.thermal-V1-ndk",

        "libbase",

    ],

    shared_libs: [

        "libbinder_ndk",

        "android.hardware.thermal-V1-ndk",

        "liblog",

    ],

    srcs: [

        "main.cpp",

        "Thermal.cpp",

    ],

    installable: false,

}



filegroup {

prebuilt_etc {

    name: "android.hardware.thermal.example.xml",

    srcs: ["thermal-example.xml"],

    src: "thermal-example.xml",

    sub_dir: "vintf",

    installable: false,

}



filegroup {

prebuilt_etc {

    name: "android.hardware.thermal.example.rc",

    srcs: ["thermal-example.rc"],

    src: "thermal-example.rc",

    installable: false,

}



apex {

    name: "com.android.hardware.thermal",

    manifest: "apex_manifest.json",

    file_contexts: "apex_file_contexts",

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

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

    updatable: false,

    vendor: true,



    binaries: [

        "android.hardware.thermal-service.example",

    ],

    prebuilts: [

        "android.hardware.thermal.example.xml",

        "android.hardware.thermal.example.rc",

    ],

}

thermal/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\.thermal-service\.example             u:object_r:hal_thermal_default_exec:s0

thermal/aidl/default/apex_manifest.json

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

    "name": "com.android.hardware.thermal",

    "version": 1

}

thermal/aidl/default/thermal-example.rc

+1 −1
Original line number Diff line number Diff line 
service vendor.thermal-example /vendor/bin/hw/android.hardware.thermal-service.example

service vendor.thermal-example /apex/com.android.hardware.thermal/bin/hw/android.hardware.thermal-service.example

    class hal

    user nobody

    group system