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

Commit ae3f1fb9 authored by Kenn Frankel's avatar Kenn Frankel
Browse files

Convert Nlinterceptor HAL to Vendor Apex (CF) 

Bug: 300011249
Test: atest VtsHalNetlinkInterceptorV1_0Test

Change-Id: I521877b24354ff95eb941daf314ca1f14d37bd70
parent 80c14fb1

wifi/netlinkinterceptor/aidl/default/Android.bp

+31 −2
Original line number Original line Diff line number Diff line
@@ -25,8 +25,6 @@ package { 




cc_binary {

cc_binary {

    name: "android.hardware.net.nlinterceptor-service.default",

    name: "android.hardware.net.nlinterceptor-service.default",

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

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

    vendor: true,

    vendor: true,

    relative_install_path: "hw",

    relative_install_path: "hw",

    defaults: ["nlinterceptor@defaults"],

    defaults: ["nlinterceptor@defaults"],
@@ -45,4 +43,35 @@ cc_binary { 
        "service.cpp",

        "service.cpp",

        "util.cpp",

        "util.cpp",

    ],

    ],

    installable: false, // installed in APEX

}



apex {

    name: "com.android.hardware.net.nlinterceptor",

    vendor: true,

    manifest: "apex_manifest.json",

    file_contexts: "apex_file_contexts",

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

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

    updatable: false,

    binaries: [

        "android.hardware.net.nlinterceptor-service.default",

    ],

    prebuilts: [

        "nlinterceptor.rc",

        "nlinterceptor.xml",

    ],

}



prebuilt_etc {

    name: "nlinterceptor.rc",

    src: "nlinterceptor.rc",

    installable: false,

}



prebuilt_etc {

    name: "nlinterceptor.xml",

    src: "nlinterceptor.xml",

    sub_dir: "vintf",

    installable: false,

}
 
}

wifi/netlinkinterceptor/aidl/default/apex_file_contexts

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

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

/bin/hw/android\.hardware\.net\.nlinterceptor-service\.default	u:object_r:hal_nlinterceptor_default_exec:s0

wifi/netlinkinterceptor/aidl/default/apex_manifest.json

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

    "name": "com.android.hardware.net.nlinterceptor",

    "version": 1

}

wifi/netlinkinterceptor/aidl/default/nlinterceptor-default.rc

deleted100644 → 0
+0 −4
Original line number Original line Diff line number Diff line 
service nlinterceptor /vendor/bin/hw/android.hardware.net.nlinterceptor-service.default

    class hal

    user root

    group system inet

wifi/netlinkinterceptor/aidl/default/nlinterceptor.rc

0 → 100644
+4 −0
Original line number Original line Diff line number Diff line 
service nlinterceptor /apex/com.android.hardware.net.nlinterceptor/bin/hw/android.hardware.net.nlinterceptor-service.default

    class hal

    user root

    group system inet