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

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

Merge changes from topic "threadnetwork-apex" into main am: de60dd2a 

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



Change-Id: I5b86509dd3b4c8be71fbd6bcfe2b537f9cd89022
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3d9a2543 de60dd2a

threadnetwork/aidl/default/Android.bp

+42 −20
Original line number Diff line number Diff line
@@ -9,22 +9,21 @@ 
//  in whole or in part, without the express written permission of

//  Google LLC.



cc_defaults {

    name: "threadnetwork_service_default",

    vintf_fragments: ["threadnetwork-default.xml"],

cc_binary {

    name: "android.hardware.threadnetwork-service",

    vendor: true,

    relative_install_path: "hw",



    shared_libs: [

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

        "libbase",

        "libbinder_ndk",

        "libcutils",

        "liblog",

        "libutils",

    ],



    static_libs: [

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

        "libbase",

        "libcutils",

        "libutils",

        "openthread-common",

        "openthread-hdlc",

        "openthread-platform",
@@ -33,6 +32,8 @@ cc_defaults { 
        "openthread-url",

    ],



    stl: "c++_static",



    srcs: [

        "main.cpp",

        "service.cpp",
@@ -41,18 +42,6 @@ cc_defaults { 
    ],

}



cc_binary {

    name: "android.hardware.threadnetwork-service.sim",

    defaults: ["threadnetwork_service_default"],

    init_rc: ["android.hardware.threadnetwork-service.sim.rc"],

    required: ["ot-rcp"],

}



cc_binary {

    name: "android.hardware.threadnetwork-service",

    defaults: ["threadnetwork_service_default"],

}



cc_fuzz {

    name: "android.hardware.threadnetwork-service.fuzzer",
@@ -85,3 +74,36 @@ cc_fuzz { 
        ],

    },

}



prebuilt_etc {

    name: "threadnetwork-default.xml",

    src: "threadnetwork-default.xml",

    sub_dir: "vintf",

    installable: false,

}



prebuilt_etc {

    name: "threadnetwork-service-sim.rc",

    src: "threadnetwork-service-sim.rc",

    installable: false,

}



apex {

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

    manifest: "manifest.json",

    file_contexts: "file_contexts",

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

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

    updatable: false,

    vendor: true,



    binaries: [

        "android.hardware.threadnetwork-service",

        "ot-rcp",

    ],

    prebuilts: [

        "threadnetwork-default.xml", // vintf_fragment

        "threadnetwork-service-sim.rc", // init_rc

        "android.hardware.thread_network.prebuilt.xml", // permission

    ],

}

threadnetwork/aidl/default/android.hardware.threadnetwork-service.sim.rc

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line 
service vendor.threadnetwork_hal /vendor/bin/hw/android.hardware.threadnetwork-service.sim spinel+hdlc+forkpty:///vendor/bin/ot-rcp?forkpty-arg=1

    class hal

    user thread_network

threadnetwork/aidl/default/file_contexts

0 → 100644
+4 −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\.threadnetwork-service            u:object_r:hal_threadnetwork_default_exec:s0

/bin/ot-rcp                                                 u:object_r:ot_rcp_exec:s0

threadnetwork/aidl/default/manifest.json

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

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

    "version": 1

}

threadnetwork/aidl/default/threadnetwork-service-sim.rc

0 → 100644
+3 −0
Original line number Diff line number Diff line 
service vendor.threadnetwork_hal /apex/com.android.hardware.threadnetwork/bin/hw/android.hardware.threadnetwork-service spinel+hdlc+forkpty:///apex/com.android.hardware.threadnetwork/bin/ot-rcp?forkpty-arg=1

    class hal

    user thread_network