From 2de38b95ac6c21b93de22d41c9ae164717ddf304 Mon Sep 17 00:00:00 2001
From: Francescodario Cuzzocrea <bosconovic@gmail.com>
Date: Tue, 14 May 2019 23:44:32 +0200
Subject: [PATCH] msm8226-common: sensors: s3ve3g -> msm8226

---
 sensors/Android.bp                            | 134 +++++++++++++++++-
 ...rdware.sensors@1.0-service.samsung8226.rc} |   2 +-
 sensors/service.cpp                           |   2 +-
 3 files changed, 133 insertions(+), 5 deletions(-)
 rename sensors/{android.hardware.sensors@1.0-service.s3ve3g.rc => android.hardware.sensors@1.0-service.samsung8226.rc} (87%)

diff --git a/sensors/Android.bp b/sensors/Android.bp
index 0eaf4b1..0c549c1 100644
--- a/sensors/Android.bp
+++ b/sensors/Android.bp
@@ -1,15 +1,143 @@
+
 cc_library_static {
-    name: "multihal-samsung",
+    name: "multihal-samsung8226",
     vendor: true,
     srcs: [
         "multihal.cpp",
-        "SensorEventQueue.cpp"
+        "SensorEventQueue.cpp",
+    ],
+    header_libs: [
+        "libhardware_headers",
     ],
     shared_libs: [
         "liblog",
         "libcutils",
         "libutils",
-        "libdl"
+        "libdl",
     ],
     export_include_dirs: ["."],
+    cflags: [
+        "-Wall",
+        "-Werror",
+    ],
+}
+
+cc_library_shared {
+    name: "android.hardware.sensors@1.0-impl.samsung8226",
+    defaults: ["hidl_defaults"],
+    proprietary: true,
+    relative_install_path: "hw",
+    srcs: ["Sensors.cpp"],
+    shared_libs: [
+        "liblog",
+        "libcutils",
+        "libhardware",
+        "libbase",
+        "libutils",
+        "libhidlbase",
+        "libhidltransport",
+        "android.hardware.sensors@1.0",
+    ],
+    static_libs: [
+        "android.hardware.sensors@1.0-convert",
+        "multihal-samsung8226",
+    ],
+    local_include_dirs: ["include/sensors"],
+}
+
+cc_binary {
+    name: "android.hardware.sensors@1.0-service.samsung8226",
+    defaults: ["hidl_defaults"],
+    relative_install_path: "hw",
+    vendor: true,
+    init_rc: ["android.hardware.sensors@1.0-service.samsung8226.rc"],
+    srcs: ["service.cpp"],
+
+    shared_libs: [
+        "liblog",
+        "libcutils",
+        "libdl",
+        "libbase",
+        "libutils",
+        "libhidlbase",
+        "libhidltransport",
+        "libhwbinder",
+        "android.hardware.sensors@1.0",
+    ],
+    arch: {
+cc_library_static {
+    name: "multihal-samsung8226",
+    vendor: true,
+    srcs: [
+        "multihal.cpp",
+        "SensorEventQueue.cpp",
+    ],
+    header_libs: [
+        "libhardware_headers",
+    ],
+    shared_libs: [
+        "liblog",
+        "libcutils",
+        "libutils",
+        "libdl",
+    ],
+    export_include_dirs: ["."],
+    cflags: [
+        "-Wall",
+        "-Werror",
+    ],
+}
+
+cc_library_shared {
+    name: "android.hardware.sensors@1.0-impl.samsung8226",
+    defaults: ["hidl_defaults"],
+    proprietary: true,
+    relative_install_path: "hw",
+    srcs: ["Sensors.cpp"],
+    shared_libs: [
+        "liblog",
+        "libcutils",
+        "libhardware",
+        "libbase",
+        "libutils",
+        "libhidlbase",
+        "libhidltransport",
+        "android.hardware.sensors@1.0",
+    ],
+    static_libs: [
+        "android.hardware.sensors@1.0-convert",
+        "multihal-samsung8226",
+    ],
+    local_include_dirs: ["include/sensors"],
+}
+
+cc_binary {
+    name: "android.hardware.sensors@1.0-service.samsung8226",
+    defaults: ["hidl_defaults"],
+    relative_install_path: "hw",
+    vendor: true,
+    init_rc: ["android.hardware.sensors@1.0-service.samsung8226.rc"],
+    srcs: ["service.cpp"],
+
+    shared_libs: [
+        "liblog",
+        "libcutils",
+        "libdl",
+        "libbase",
+        "libutils",
+        "libhidlbase",
+        "libhidltransport",
+        "libhwbinder",
+        "android.hardware.sensors@1.0",
+    ],
+    arch: {
+        arm: {
+            cflags: ["-DARCH_ARM_32"],
+        },
+    },
+}
+        arm: {
+            cflags: ["-DARCH_ARM_32"],
+        },
+    },
 }
diff --git a/sensors/android.hardware.sensors@1.0-service.s3ve3g.rc b/sensors/android.hardware.sensors@1.0-service.samsung8226.rc
similarity index 87%
rename from sensors/android.hardware.sensors@1.0-service.s3ve3g.rc
rename to sensors/android.hardware.sensors@1.0-service.samsung8226.rc
index 58fd791..40d89de 100644
--- a/sensors/android.hardware.sensors@1.0-service.s3ve3g.rc
+++ b/sensors/android.hardware.sensors@1.0-service.samsung8226.rc
@@ -1,4 +1,4 @@
-service sensors-hal-1-0 /vendor/bin/hw/android.hardware.sensors@1.0-service.s3ve3g
+service sensors-hal-1-0 /vendor/bin/hw/android.hardware.sensors@1.0-service.samsung8226
     class hal
     user root
     group system input wakelock
diff --git a/sensors/service.cpp b/sensors/service.cpp
index 4fe495c..65f6d81 100644
--- a/sensors/service.cpp
+++ b/sensors/service.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define LOG_TAG "android.hardware.sensors@1.0-service.wt88047"
+#define LOG_TAG "android.hardware.sensors@1.0-service"
 
 #include <android/hardware/sensors/1.0/ISensors.h>
 #include <hidl/LegacySupport.h>