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

Commit ed0da8c2 authored by Deyao Ren's avatar Deyao Ren Committed by Gerrit Code Review
Browse files

Merge changes from topic "cherry-pick-b210883464" 

* changes:
  Fixes sensors AIDL default impl APEX's binary name.
  Cuttlefish sensors apex uses aidl implementation
parents e0ade8fe d20ebb4f

sensors/2.1/default/apex/apex_manifest.json

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

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

  "version": 1

}

sensors/2.1/default/apex/com.android.hardware.sensors.rc

deleted100644 → 0
+0 −7
Original line number Original line Diff line number Diff line 
service vendor.sensors-hal-2-1-mock /apex/com.android.hardware.sensors/bin/hw/android.hardware.sensors@2.1-service.mock

    interface android.hardware.sensors@2.0::ISensors default

    interface android.hardware.sensors@2.1::ISensors default

    class hal

    user system

    group system

    rlimit rtprio 10 10

sensors/aidl/default/Android.bp

+12 −2
Original line number Original line Diff line number Diff line
@@ -23,6 +23,16 @@ package { 
    default_applicable_licenses: ["hardware_interfaces_license"],

    default_applicable_licenses: ["hardware_interfaces_license"],

}

}





filegroup {

    name: "sensors-default.rc",

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

}



filegroup {

    name: "sensors-default.xml",

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

}



cc_library_static {

cc_library_static {

    name: "libsensorsexampleimpl",

    name: "libsensorsexampleimpl",

    vendor: true,

    vendor: true,
@@ -47,8 +57,8 @@ cc_library_static { 
cc_binary {

cc_binary {

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

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

    relative_install_path: "hw",

    relative_install_path: "hw",

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

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

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

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

    vendor: true,

    vendor: true,

    shared_libs: [

    shared_libs: [

        "libbase",

        "libbase",

sensors/2.1/default/apex/Android.bp→sensors/aidl/default/apex/Android.bp

+10 −3
Original line number Original line Diff line number Diff line
@@ -13,9 +13,16 @@ android_app_certificate { 
    certificate: "com.android.hardware.sensors",

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

}

}





genrule {

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

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

    out: ["com.android.hardware.sensors.rc"],

    cmd: "sed -E 's/\\/vendor/\\/apex\\/com.android.hardware.sensors/' $(in) > $(out)",

}



prebuilt_etc {

prebuilt_etc {

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

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

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

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

    installable: false,

    installable: false,

}

}
@@ -31,7 +38,7 @@ apex { 
    updatable: false,

    updatable: false,

    // Install the apex in /vendor/apex

    // Install the apex in /vendor/apex

    soc_specific: true,

    soc_specific: true,

    binaries: ["android.hardware.sensors@2.1-service.mock"],

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

    prebuilts: [

    prebuilts: [

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

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

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

        "android.hardware.sensor.ambient_temperature.prebuilt.xml",
@@ -42,5 +49,5 @@ apex { 
        "android.hardware.sensor.proximity.prebuilt.xml",

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

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

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

    ],

    ],

    vintf_fragments: [":android.hardware.sensors@2.1.xml"],

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

}
 
}

sensors/aidl/default/apex/apex_manifest.json

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

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

    "version": 1

}