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

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

Merge "Cleanup: use shared apex_key" into main am: 6693205f am: 70338b35... 

Merge "Cleanup: use shared apex_key" into main am: 6693205f am: 70338b35 am: 8ac3c1c8 am: 3e3b89fd

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



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

sensors/aidl/default/Android.bp

+4 −2
Original line number Diff line number Diff line
@@ -28,9 +28,11 @@ filegroup { 
    srcs: ["sensors-default.rc"],

}



filegroup {

prebuilt_etc {

    name: "sensors-default.xml",

    srcs: ["sensors-default.xml"],

    src: "sensors-default.xml",

    sub_dir: "vintf",

    installable: false,

}



cc_library_static {

sensors/aidl/default/apex/Android.bp

+6 −18
Original line number Diff line number Diff line
@@ -2,17 +2,6 @@ package { 
    default_applicable_licenses: ["hardware_interfaces_license"],

}



apex_key {

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

    public_key: "com.android.hardware.sensors.avbpubkey",

    private_key: "com.android.hardware.sensors.pem",

}



android_app_certificate {

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

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

}



genrule {

    name: "com.android.hardware.sensors.rc-gen",

    srcs: [":sensors-default.rc"],
@@ -31,16 +20,16 @@ prebuilt_etc { 
apex {

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

    manifest: "apex_manifest.json",

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

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

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

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

    file_contexts: "file_contexts",

    use_vndk_as_stable: true,

    updatable: false,

    // Install the apex in /vendor/apex

    soc_specific: true,

    vendor: true,



    binaries: ["android.hardware.sensors-service.example"],

    prebuilts: [

        "com.android.hardware.sensors.rc",

        "com.android.hardware.sensors.rc", // init rc

        "sensors-default.xml", // vintf fragment

        "android.hardware.sensor.ambient_temperature.prebuilt.xml",

        "android.hardware.sensor.barometer.prebuilt.xml",

        "android.hardware.sensor.gyroscope.prebuilt.xml",
@@ -49,5 +38,4 @@ apex { 
        "android.hardware.sensor.proximity.prebuilt.xml",

        "android.hardware.sensor.relative_humidity.prebuilt.xml",

    ],

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

}

sensors/aidl/default/apex/file_contexts

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

# Permission XMLs

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

# Service binary

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

/bin/hw/android\.hardware\.sensors-service\.example   u:object_r:hal_sensors_default_exec:s0
 
 No newline at end of file