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

Commit fb5f35b7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add gnss HAL APEX" into main am: 6a4d7630 

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



Change-Id: I6341e6181dc9377a7f53c2301311b8bdb7706e09
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1b56451c 6a4d7630

gnss/aidl/default/Android.bp

+33 −6
Original line number Diff line number Diff line
@@ -26,12 +26,7 @@ package { 
cc_binary {

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

    relative_install_path: "hw",

    init_rc: [

        "gnss-default.rc",

    ],

    vintf_fragments: [

        "gnss-default.xml",

    ],

    installable: false, // install APEX instead

    vendor: true,

    cflags: [

        "-Wall",
@@ -73,3 +68,35 @@ cc_binary { 
        "android.hardware.gnss@common-default-lib",

    ],

}



prebuilt_etc {

    name: "gnss-default.rc",

    src: "gnss-default.rc",

    installable: false,

}



prebuilt_etc {

    name: "gnss-default.xml",

    src: "gnss-default.xml",

    sub_dir: "vintf",

    installable: false,

}



apex {

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

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

    ],

    prebuilts: [

        "gnss-default.rc",

        "gnss-default.xml",

        "android.hardware.location.gps.prebuilt.xml", // permission

    ],

}

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

gnss/aidl/default/apex_manifest.json

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

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

    "version": 1

}

gnss/aidl/default/gnss-default.rc

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

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

    class hal

    user nobody

    group nobody