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

Commit 1f05f9d3 authored by Jooyung Han's avatar Jooyung Han Committed by Gerrit Code Review
Browse files

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

* changes:
  Add thermal HAL APEX
  Add tetheroffload HAL APEX
parents 2b2e8808 7a16e48e

tetheroffload/aidl/default/Android.bp

+39 −5
Original line number Diff line number Diff line
@@ -19,18 +19,52 @@ package { 
cc_binary {

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

    relative_install_path: "hw",

    init_rc: ["tetheroffload-example.rc"],

    vintf_fragments: ["tetheroffload-example.xml"],

    vendor: true,

    shared_libs: [



    stl: "c++_static",

    static_libs: [

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

        "libbase",

    ],

    shared_libs: [

        "libbinder_ndk",

        "libcutils",

        "libutils",

        "liblog",

    ],

    srcs: [

        "main.cpp",

        "Offload.cpp",

    ],



    installable: false, // installed in APEX

}



prebuilt_etc {

    name: "tetheroffload-example.rc",

    src: "tetheroffload-example.rc",

    installable: false,

}



prebuilt_etc {

    name: "tetheroffload-example.xml",

    src: "tetheroffload-example.xml",

    sub_dir: "vintf",

    installable: false,

}



apex {

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

    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.tetheroffload-service.example",

    ],

    prebuilts: [

        "tetheroffload-example.rc",

        "tetheroffload-example.xml",

    ],

}

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

tetheroffload/aidl/default/apex_manifest.json

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

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

    "version": 1

}

tetheroffload/aidl/default/tetheroffload-example.rc

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

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

    class hal

    user nobody

    group nobody

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",

    ],

}