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

Commit 7a63ec77 authored by Nick Chalko's avatar Nick Chalko Committed by Android (Google) Code Review
Browse files

Merge changes from topic "revert-10501254-multihal_2_1-FNHFKNQMKB" into rvc-dev 

* changes:
  Revert "Set up Multi-HAL for Sensors HAL 2.1"
  Revert "Create Multi-HAL 2.1 service"
  Revert "Update tests for multihal to test HAL 2.1"
parents 89b21669 cd5d437a

sensors/2.0/multihal/Android.bp

+1 −7
Original line number Diff line number Diff line
@@ -25,9 +25,6 @@ cc_binary { 
    ],

    init_rc: ["android.hardware.sensors@2.0-service-multihal.rc"],

    vintf_fragments: ["android.hardware.sensors@2.0-multihal.xml"],

    header_libs: [

        "android.hardware.sensors@2.X-shared-utils",

    ],

    shared_libs: [

        "android.hardware.sensors@2.0",

        "android.hardware.sensors@2.0-ScopedWakelock",
@@ -40,8 +37,5 @@ cc_binary { 
        "libpower",

        "libutils",

    ],

    static_libs: [

        "android.hardware.sensors@1.0-convert",

        "android.hardware.sensors@2.X-multihal",

    ],

    static_libs: ["android.hardware.sensors@2.X-multihal"],

}

sensors/2.0/multihal/service.cpp

+2 −2
Original line number Diff line number Diff line
@@ -23,12 +23,12 @@ 
using android::hardware::configureRpcThreadpool;

using android::hardware::joinRpcThreadpool;

using android::hardware::sensors::V2_0::ISensors;

using android::hardware::sensors::V2_1::implementation::HalProxyV2_0;

using android::hardware::sensors::V2_0::implementation::HalProxy;



int main(int /* argc */, char** /* argv */) {

    configureRpcThreadpool(1, true);



    android::sp<ISensors> halProxy = new HalProxyV2_0();

    android::sp<ISensors> halProxy = new HalProxy();

    if (halProxy->registerAsService() != ::android::OK) {

        ALOGE("Failed to register Sensors HAL instance");

        return -1;

sensors/2.1/multihal/Android.bp

deleted100644 → 0
+0 −47
Original line number Diff line number Diff line 
//

// Copyright (C) 2020 The Android Open Source Project

//

// Licensed under the Apache License, Version 2.0 (the "License");

// you may not use this file except in compliance with the License.

// You may obtain a copy of the License at

//

//      http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing, software

// distributed under the License is distributed on an "AS IS" BASIS,

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// limitations under the License.



cc_binary {

    name: "android.hardware.sensors@2.1-service.multihal",

    defaults: [

        "hidl_defaults",

    ],

    vendor: true,

    relative_install_path: "hw",

    srcs: [

        "service.cpp",

    ],

    init_rc: ["android.hardware.sensors@2.1-service-multihal.rc"],

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

    header_libs: [

        "android.hardware.sensors@2.X-shared-utils",

    ],

    shared_libs: [

        "android.hardware.sensors@2.0",

        "android.hardware.sensors@2.0-ScopedWakelock",

        "android.hardware.sensors@2.1",

        "libbase",

        "libcutils",

        "libfmq",

        "libhidlbase",

        "liblog",

        "libpower",

        "libutils",

    ],

    static_libs: [

        "android.hardware.sensors@1.0-convert",

        "android.hardware.sensors@2.X-multihal",

    ],

}

sensors/2.1/multihal/OWNERS

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line 
arthuri@google.com

bduddie@google.com

stange@google.com
 
 No newline at end of file

sensors/2.1/multihal/android.hardware.sensors@2.1-multihal.xml

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
<manifest version="1.0" type="device">

    <hal format="hidl">

        <name>android.hardware.sensors</name>

        <transport>hwbinder</transport>

        <version>2.1</version>

        <interface>

            <name>ISensors</name>

            <instance>default</instance>

        </interface>

    </hal>

</manifest>