summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Chan <jc@lineageos.org>2020-05-15 21:48:07 +0800
committerJesse Chan <jc@lineageos.org>2020-05-15 21:53:36 +0800
commit3e3dfb28a98f119eae8848bf87ccf1eed3eda745 (patch)
treedf2f2f087b4a5e072890aa481dba1c8f1929b98e
parent8e654496b7553d97a39e7ac44bcfec5d79b12fbc (diff)
downloadandroid_hardware_samsung-3e3dfb28a98f119eae8848bf87ccf1eed3eda745.tar.gz
android_hardware_samsung-3e3dfb28a98f119eae8848bf87ccf1eed3eda745.tar.bz2
android_hardware_samsung-3e3dfb28a98f119eae8848bf87ccf1eed3eda745.zip
sensors: adapt and rebrand for hardware/samsung
Change-Id: I6c0521888ad60e5ecdd967809f91d0962a7c08a8 Signed-off-by: Jesse Chan <jc@lineageos.org>
-rw-r--r--hidl/sensors/Android.bp3
-rw-r--r--hidl/sensors/Sensors.cpp2
-rw-r--r--hidl/sensors/Sensors.h6
3 files changed, 5 insertions, 6 deletions
diff --git a/hidl/sensors/Android.bp b/hidl/sensors/Android.bp
index 4edf7b9..ecf6412 100644
--- a/hidl/sensors/Android.bp
+++ b/hidl/sensors/Android.bp
@@ -1,5 +1,5 @@
cc_library_shared {
- name: "android.hardware.sensors@1.0-impl",
+ name: "android.hardware.sensors@1.0-impl.samsung",
defaults: ["hidl_defaults"],
proprietary: true,
relative_install_path: "hw",
@@ -18,5 +18,4 @@ cc_library_shared {
"android.hardware.sensors@1.0-convert",
"multihal",
],
- local_include_dirs: ["include/sensors"],
}
diff --git a/hidl/sensors/Sensors.cpp b/hidl/sensors/Sensors.cpp
index 1100dd6..678ac72 100644
--- a/hidl/sensors/Sensors.cpp
+++ b/hidl/sensors/Sensors.cpp
@@ -15,7 +15,7 @@
*/
#include "Sensors.h"
-#include "convert.h"
+#include <sensors/convert.h>
#include "multihal.h"
#include <android-base/logging.h>
diff --git a/hidl/sensors/Sensors.h b/hidl/sensors/Sensors.h
index be00a96..a43a00d 100644
--- a/hidl/sensors/Sensors.h
+++ b/hidl/sensors/Sensors.h
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-#ifndef HARDWARE_INTERFACES_SENSORS_V1_0_DEFAULT_SENSORS_H_
+#ifndef HARDWARE_INTERFACES_SENSORS_V1_0_SAMSUNG_SENSORS_H_
-#define HARDWARE_INTERFACES_SENSORS_V1_0_DEFAULT_SENSORS_H_
+#define HARDWARE_INTERFACES_SENSORS_V1_0_SAMSUNG_SENSORS_H_
#include <android-base/macros.h>
#include <android/hardware/sensors/1.0/ISensors.h>
@@ -85,4 +85,4 @@ extern "C" ISensors *HIDL_FETCH_ISensors(const char *name);
} // namespace hardware
} // namespace android
-#endif // HARDWARE_INTERFACES_SENSORS_V1_0_DEFAULT_SENSORS_H_
+#endif // HARDWARE_INTERFACES_SENSORS_V1_0_SAMSUNG_SENSORS_H_