Revert "sensors: adding a common convert lib"
Revert submission 2313818-sensors_shared_convert
Reason for revert: Breaks wembley_2GB-userdebug
Reverted Changes:
Icf64c8809:sensorservice: use new convert functions
Ibc6ed5566:libandroid_sensor_headers: make host_supported and...
Ib80130fc0:sensors: adding a common convert lib
Change-Id: I3f4cb4dc228b5bf6f81f451c11c11d6ebf19639a
diff --git a/sensors/1.0/default/Android.bp b/sensors/1.0/default/Android.bp
index bb31050..2e4e1b0 100644
--- a/sensors/1.0/default/Android.bp
+++ b/sensors/1.0/default/Android.bp
@@ -44,12 +44,6 @@
"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",
diff --git a/sensors/1.0/default/convert.cpp b/sensors/1.0/default/convert.cpp
index ae71a97..43ee327 100644
--- a/sensors/1.0/default/convert.cpp
+++ b/sensors/1.0/default/convert.cpp
@@ -196,11 +196,6 @@
}
}
-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,
diff --git a/sensors/1.0/default/include/sensors/convert.h b/sensors/1.0/default/include/sensors/convert.h
index ae773df..c3a0125 100644
--- a/sensors/1.0/default/include/sensors/convert.h
+++ b/sensors/1.0/default/include/sensors/convert.h
@@ -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 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);
diff --git a/sensors/aidl/convert/Android.bp b/sensors/aidl/convert/Android.bp
index 0b31597..d47de8e 100644
--- a/sensors/aidl/convert/Android.bp
+++ b/sensors/aidl/convert/Android.bp
@@ -37,12 +37,6 @@
"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",
diff --git a/sensors/aidl/convert/convert.cpp b/sensors/aidl/convert/convert.cpp
index abd4d55..415f435 100644
--- a/sensors/aidl/convert/convert.cpp
+++ b/sensors/aidl/convert/convert.cpp
@@ -490,10 +490,6 @@
}
}
-void convertFromASensorEvent(const ASensorEvent& src, Event* dst) {
- convertFromSensorEvent(common::convertASensorEvent(src), dst);
-}
-
} // namespace implementation
} // namespace sensors
} // namespace hardware
diff --git a/sensors/aidl/convert/include/aidl/sensors/convert.h b/sensors/aidl/convert/include/aidl/sensors/convert.h
index 44504fe..702b226 100644
--- a/sensors/aidl/convert/include/aidl/sensors/convert.h
+++ b/sensors/aidl/convert/include/aidl/sensors/convert.h
@@ -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 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
diff --git a/sensors/common/convert/Android.bp b/sensors/common/convert/Android.bp
deleted file mode 100644
index 230665e..0000000
--- a/sensors/common/convert/Android.bp
+++ /dev/null
@@ -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",
- ],
-}
diff --git a/sensors/common/convert/convert.cpp b/sensors/common/convert/convert.cpp
deleted file mode 100644
index 27de32c..0000000
--- a/sensors/common/convert/convert.cpp
+++ /dev/null
@@ -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
diff --git a/sensors/common/convert/include/sensors/common_convert.h b/sensors/common/convert/include/sensors/common_convert.h
deleted file mode 100644
index a281369..0000000
--- a/sensors/common/convert/include/sensors/common_convert.h
+++ /dev/null
@@ -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