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

Commit 05d7496e authored by Anthony Stange's avatar Anthony Stange
Browse files

Move Multi-HAL 2.0 to the common directory 

Sensors Multi-HAL 2.0 will soon have a shared implementation for both
Sensors HAL 2.0 and 2.1 and moving the files to the common directory
first will minimize the diff in upcoming CLs.

Bug: 149758467
Test: compile
Change-Id: I15f84a7aaa302d83d4f4b1ffe357f515e36d6382
parent 14499028

sensors/2.0/multihal/Android.bp

+9 −78
Original line number Original line Diff line number Diff line
@@ -13,97 +13,28 @@ 
// See the License for the specific language governing permissions and

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

// limitations under the License.

// limitations under the License.





cc_defaults {

    name: "android.hardware.sensors@2.0-multihal-defaults",

    header_libs: [

        "android.hardware.sensors@2.0-multihal.header",

    ],

    shared_libs: [

        "android.hardware.sensors@1.0",

        "android.hardware.sensors@2.0",

        "libbase",

        "libcutils",

        "libfmq",

        "libhidlbase",

        "liblog",

        "libpower",

        "libutils",

    ],

    cflags: ["-DLOG_TAG=\"SensorsMultiHal\""],

}



cc_binary {

cc_binary {

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

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

    defaults: [

    defaults: [

        "hidl_defaults",

        "hidl_defaults",

        "android.hardware.sensors@2.0-multihal-defaults",

    ],

    ],

    vendor: true,

    vendor: true,

    relative_install_path: "hw",

    relative_install_path: "hw",

    srcs: [

    srcs: [

        "service.cpp",

        "service.cpp",

        "HalProxy.cpp",

    ],

    ],

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

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

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

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

    shared_libs: ["android.hardware.sensors@2.0-ScopedWakelock"],

}



cc_library_headers {

    name: "android.hardware.sensors@2.0-multihal.header",

    vendor_available: true,

    export_include_dirs: ["include"],

}



cc_library_shared {

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

    defaults: [

        "hidl_defaults",

        "android.hardware.sensors@2.0-multihal-defaults",

    ],

    srcs: [

        "ScopedWakelock.cpp",

    ],

    vendor_available: true,

    export_header_lib_headers: [

        "android.hardware.sensors@2.0-multihal.header",

    ],

}



// The below targets should only be used for testing.

cc_test_library {

    name: "android.hardware.sensors@2.0-HalProxy",

    defaults: [

        "hidl_defaults",

        "android.hardware.sensors@2.0-multihal-defaults",

    ],

    vendor_available: true,

    srcs: [

        "HalProxy.cpp",

    ],

    export_header_lib_headers: [

        "android.hardware.sensors@2.0-multihal.header",

    ],

    export_shared_lib_headers: [

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

    ],

    shared_libs: [

    shared_libs: [

        "libutils",

        "android.hardware.sensors@2.0",

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

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

        "libbase",

        "libcutils",

        "libfmq",

        "libhidlbase",

        "liblog",

        "libpower",

        "libutils",

    ],

    ],

}

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



cc_test_library {

    name: "android.hardware.sensors@2.0-ScopedWakelock.testlib",

    defaults: [

        "hidl_defaults",

        "android.hardware.sensors@2.0-multihal-defaults",

    ],

    srcs: [

        "ScopedWakelock.cpp",

    ],

    vendor_available: true,

    export_header_lib_headers: [

        "android.hardware.sensors@2.0-multihal.header",

    ],

}
 
}

sensors/common/default/2.X/multihal/Android.bp

0 → 100644
+84 −0
Original line number Original line Diff line number Diff line 
//

// Copyright (C) 2019 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_defaults {

    name: "android.hardware.sensors@2.X-multihal-defaults",

    header_libs: [

        "android.hardware.sensors@2.0-multihal.header",

    ],

    shared_libs: [

        "android.hardware.sensors@1.0",

        "android.hardware.sensors@2.0",

        "libbase",

        "libcutils",

        "libfmq",

        "libhidlbase",

        "liblog",

        "libpower",

        "libutils",

    ],

    cflags: ["-DLOG_TAG=\"SensorsMultiHal\""],

}



cc_library_headers {

    name: "android.hardware.sensors@2.0-multihal.header",

    vendor_available: true,

    export_include_dirs: ["include"],

}



cc_library_static {

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

    defaults: [

        "hidl_defaults",

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

    ],

    srcs: [

        "HalProxy.cpp",

    ],

    vendor_available: true,

    export_header_lib_headers: [

        "android.hardware.sensors@2.0-multihal.header",

    ],

}



cc_library_shared {

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

    defaults: [

        "hidl_defaults",

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

    ],

    srcs: [

        "ScopedWakelock.cpp",

    ],

    vendor_available: true,

    export_header_lib_headers: [

        "android.hardware.sensors@2.0-multihal.header",

    ],

}



cc_test_library {

    name: "android.hardware.sensors@2.0-ScopedWakelock.testlib",

    defaults: [

        "hidl_defaults",

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

    ],

    srcs: [

        "ScopedWakelock.cpp",

    ],

    vendor_available: true,

    export_header_lib_headers: [

        "android.hardware.sensors@2.0-multihal.header",

    ],

}