Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Revert "sensors: adding a common convert lib"" am: df0bf96001

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

Change-Id: Idf8dea1fdc22395f05d1849cc2406c7ac59134ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Krzysztof Kosiński
2022-11-30 09:27:37 +00:00
committed by Automerger Merge Worker
parent 13810ea344 df0bf96001
commit 11b7a8c73f
9 changed files with 0 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sensors/1.0/default/Android.bp
View File

@@ -44,12 +44,6 @@ cc_library_static {
"libhidlbase",
"android.hardware.sensors@1.0",
],
whole_static_libs: [
"sensors_common_convert",
],
export_static_lib_headers: [
"sensors_common_convert",
],
local_include_dirs: ["include/sensors"],
export_shared_lib_headers: [
"libhardware",

5
sensors/1.0/default/convert.cpp
View File

@@ -196,11 +196,6 @@ void convertFromSensorEvent(const sensors_event_t &src, Event *dst) {
}
}
void convertFromASensorEvent(const ASensorEvent& src, Event* dst) {
convertFromSensorEvent(
android::hardware::sensors::implementation::common::convertASensorEvent(src), dst);
}
void convertToSensorEvent(const Event &src, sensors_event_t *dst) {
*dst = {.version = sizeof(sensors_event_t),
.sensor = src.sensorHandle,

2
sensors/1.0/default/include/sensors/convert.h
View File

@@ -20,7 +20,6 @@
#include <android/hardware/sensors/1.0/ISensors.h>
#include <hardware/sensors.h>
#include <sensors/common_convert.h>
namespace android {
namespace hardware {
@@ -32,7 +31,6 @@ void convertFromSensor(const sensor_t &src, SensorInfo *dst);
void convertToSensor(const SensorInfo &src, sensor_t *dst);
void convertFromSensorEvent(const sensors_event_t &src, Event *dst);
void convertFromASensorEvent(const ASensorEvent& src, Event* dst);
void convertToSensorEvent(const Event &src, sensors_event_t *dst);
bool convertFromSharedMemInfo(const SharedMemInfo& memIn, sensors_direct_mem_t *memOut);

6
sensors/aidl/convert/Android.bp
View File

@@ -37,12 +37,6 @@ cc_library_static {
"libutils",
"android.hardware.sensors-V1-ndk",
],
whole_static_libs: [
"sensors_common_convert",
],
export_static_lib_headers: [
"sensors_common_convert",
],
local_include_dirs: ["include/aidl/sensors"],
export_shared_lib_headers: [
"libhardware",

4
sensors/aidl/convert/convert.cpp
View File

@@ -490,10 +490,6 @@ void convertFromSensorEvent(const sensors_event_t& src, Event* dst) {
}
}
void convertFromASensorEvent(const ASensorEvent& src, Event* dst) {
convertFromSensorEvent(common::convertASensorEvent(src), dst);
}
} // namespace implementation
} // namespace sensors
} // namespace hardware

2
sensors/aidl/convert/include/aidl/sensors/convert.h
View File

@@ -18,7 +18,6 @@
#include <aidl/android/hardware/sensors/ISensors.h>
#include <hardware/sensors.h>
#include <sensors/common_convert.h>
namespace android {
namespace hardware {
@@ -30,7 +29,6 @@ void convertToSensor(const aidl::android::hardware::sensors::SensorInfo& src, se
void convertToSensorEvent(const aidl::android::hardware::sensors::Event& src, sensors_event_t* dst);
void convertFromSensorEvent(const sensors_event_t& src,
aidl::android::hardware::sensors::Event* dst);
void convertFromASensorEvent(const ASensorEvent& src, aidl::android::hardware::sensors::Event* dst);
} // namespace implementation
} // namespace sensors

42
sensors/common/convert/Android.bp
View File

@@ -1,42 +0,0 @@
// Copyright (C) 2022 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.
package {
default_applicable_licenses: ["Android-Apache-2.0"],
}
cc_library {
name: "sensors_common_convert",
srcs: [
"convert.cpp",
],
vendor_available: true,
host_supported: true,
local_include_dirs: ["include"],
cflags: [
"-Wall",
"-Werror",
],
shared_libs: [
"libhardware",
],
header_libs: [
"libandroid_sensor_headers",
],
export_include_dirs: ["include"],
export_header_lib_headers: [
"libandroid_sensor_headers",
],
}

40
sensors/common/convert/convert.cpp
View File

@@ -1,40 +0,0 @@
/*
* Copyright (C) 2022 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.
*/
#include <sensors/common_convert.h>
#include <cstring>
namespace android {
namespace hardware {
namespace sensors {
namespace implementation {
namespace common {
sensors_event_t convertASensorEvent(const ASensorEvent& src) {
// Attempt to ensure these types are compatible.
static_assert(sizeof(sensors_event_t) == sizeof(ASensorEvent));
static_assert(offsetof(sensors_event_t, timestamp) == offsetof(ASensorEvent, timestamp));
static_assert(offsetof(sensors_event_t, flags) == offsetof(ASensorEvent, flags));
// TODO(b/259711109) Follow up work to handle this in a safer way.
return *reinterpret_cast<const sensors_event_t*>(&src);
}
} // namespace common
} // namespace implementation
} // namespace sensors
} // namespace hardware
} // namespace android

34
sensors/common/convert/include/sensors/common_convert.h
View File

@@ -1,34 +0,0 @@
/*
* Copyright (C) 2022 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.
*/
#pragma once
#include <android/sensor.h>
#include <hardware/sensors.h>
namespace android {
namespace hardware {
namespace sensors {
namespace implementation {
namespace common {
sensors_event_t convertASensorEvent(const ASensorEvent& aEvent);
} // namespace common
} // namespace implementation
} // namespace sensors
} // namespace hardware
} // namespace android