From 92caade44dcbf4c72459d7a3f2cd364ca9cfb663 Mon Sep 17 00:00:00 2001
From: Ruchit Marathe <ruchitmarathe@gmail.com>
Date: Tue, 20 Sep 2022 22:31:50 +0530
Subject: [PATCH] sm7125: aidl: rebrand all services

---
 aidl/light/Android.bp                                |  6 +++---
 aidl/light/Lights.cpp                                |  2 +-
 ...0.rc => android.hardware.light-service.sm7125.rc} |  2 +-
 ...xml => android.hardware.light-service.sm7125.xml} |  0
 aidl/light/service.cpp                               |  2 +-
 aidl/memtrack/Android.bp                             |  6 +++---
 .../{memtrack-exynos9810.rc => memtrack-sm7125.rc}   |  2 +-
 .../{memtrack-exynos9810.xml => memtrack-sm7125.xml} |  0
 aidl/power-libperfmgr/Android.bp                     |  6 +++---
 aidl/power-libperfmgr/PowerExt.cpp                   |  2 +-
 ...roid.hardware.power-service.sm7125-libperfmgr.rc} |  2 +-
 ...xml => android.hardware.power-service.sm7125.xml} |  0
 aidl/sensors/Android.bp                              |  6 +++---
 ...roid.hardware.sensors-service.sm7125-multihal.rc} |  2 +-
 ... => android.hardware.sensors-sm7125-multihal.xml} |  0
 aidl/usb/Android.bp                                  |  6 +++---
 ...810.rc => android.hardware.usb-service.sm7125.rc} |  2 +-
 ...0.xml => android.hardware.usb-service.sm7125.xml} |  0
 common.mk                                            | 10 +++++-----
 sepolicy/vendor/file_contexts                        | 12 +++++-------
 20 files changed, 33 insertions(+), 35 deletions(-)
 rename aidl/light/{android.hardware.light-service.exynos9810.rc => android.hardware.light-service.sm7125.rc} (85%)
 rename aidl/light/{android.hardware.light-service.exynos9810.xml => android.hardware.light-service.sm7125.xml} (100%)
 rename aidl/memtrack/{memtrack-exynos9810.rc => memtrack-sm7125.rc} (79%)
 rename aidl/memtrack/{memtrack-exynos9810.xml => memtrack-sm7125.xml} (100%)
 rename aidl/power-libperfmgr/{android.hardware.power-service.exynos9810-libperfmgr.rc => android.hardware.power-service.sm7125-libperfmgr.rc} (96%)
 rename aidl/power-libperfmgr/{android.hardware.power-service.exynos9810.xml => android.hardware.power-service.sm7125.xml} (100%)
 rename aidl/sensors/{android.hardware.sensors-service.exynos9810-multihal.rc => android.hardware.sensors-service.sm7125-multihal.rc} (85%)
 rename aidl/sensors/{android.hardware.sensors-exynos9810-multihal.xml => android.hardware.sensors-sm7125-multihal.xml} (100%)
 rename aidl/usb/{android.hardware.usb-service.exynos9810.rc => android.hardware.usb-service.sm7125.rc} (97%)
 rename aidl/usb/{android.hardware.usb-service.exynos9810.xml => android.hardware.usb-service.sm7125.xml} (100%)

diff --git a/aidl/light/Android.bp b/aidl/light/Android.bp
index e22737a..d0232b5 100644
--- a/aidl/light/Android.bp
+++ b/aidl/light/Android.bp
@@ -5,10 +5,10 @@
 //
 
 cc_binary {
-    name: "android.hardware.light-service.exynos9810",
+    name: "android.hardware.light-service.sm7125",
     relative_install_path: "hw",
-    init_rc: ["android.hardware.light-service.exynos9810.rc"],
-    vintf_fragments: ["android.hardware.light-service.exynos9810.xml"],
+    init_rc: ["android.hardware.light-service.sm7125.rc"],
+    vintf_fragments: ["android.hardware.light-service.sm7125.xml"],
     local_include_dirs: ["include"],
     srcs: [
         "Lights.cpp",
diff --git a/aidl/light/Lights.cpp b/aidl/light/Lights.cpp
index 7d91c87..e891007 100644
--- a/aidl/light/Lights.cpp
+++ b/aidl/light/Lights.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#define LOG_TAG "android.hardware.lights-service.exynos9810"
+#define LOG_TAG "android.hardware.lights-service.sm7125"
 
 #include <android-base/stringprintf.h>
 #include <fstream>
diff --git a/aidl/light/android.hardware.light-service.exynos9810.rc b/aidl/light/android.hardware.light-service.sm7125.rc
similarity index 85%
rename from aidl/light/android.hardware.light-service.exynos9810.rc
rename to aidl/light/android.hardware.light-service.sm7125.rc
index 08ffb7f..ceaabef 100644
--- a/aidl/light/android.hardware.light-service.exynos9810.rc
+++ b/aidl/light/android.hardware.light-service.sm7125.rc
@@ -1,4 +1,4 @@
-service vendor.light-default /vendor/bin/hw/android.hardware.light-service.exynos9810
+service vendor.light-default /vendor/bin/hw/android.hardware.light-service.sm7125
     class hal
     user system
     group system
diff --git a/aidl/light/android.hardware.light-service.exynos9810.xml b/aidl/light/android.hardware.light-service.sm7125.xml
similarity index 100%
rename from aidl/light/android.hardware.light-service.exynos9810.xml
rename to aidl/light/android.hardware.light-service.sm7125.xml
diff --git a/aidl/light/service.cpp b/aidl/light/service.cpp
index 27fc419..2cb1a59 100644
--- a/aidl/light/service.cpp
+++ b/aidl/light/service.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#define LOG_TAG "android.hardware.light-service.exynos9810"
+#define LOG_TAG "android.hardware.light-service.sm7125"
 
 #include "Lights.h"
 
diff --git a/aidl/memtrack/Android.bp b/aidl/memtrack/Android.bp
index 5d368cc..58116a8 100755
--- a/aidl/memtrack/Android.bp
+++ b/aidl/memtrack/Android.bp
@@ -13,10 +13,10 @@
 // limitations under the License.
 
 cc_binary {
-    name: "android.hardware.memtrack-service.exynos9810",
+    name: "android.hardware.memtrack-service.s",
     relative_install_path: "hw",
-    init_rc: ["memtrack-exynos9810.rc"],
-    vintf_fragments: ["memtrack-exynos9810.xml"],
+    init_rc: ["memtrack-sm7125.rc"],
+    vintf_fragments: ["memtrack-sm7125.xml"],
     vendor: true,
     shared_libs: [
         "libbase",
diff --git a/aidl/memtrack/memtrack-exynos9810.rc b/aidl/memtrack/memtrack-sm7125.rc
similarity index 79%
rename from aidl/memtrack/memtrack-exynos9810.rc
rename to aidl/memtrack/memtrack-sm7125.rc
index 643c537..f3427e2 100755
--- a/aidl/memtrack/memtrack-exynos9810.rc
+++ b/aidl/memtrack/memtrack-sm7125.rc
@@ -1,4 +1,4 @@
-service vendor.memtrack-default /vendor/bin/hw/android.hardware.memtrack-service.exynos9810
+service vendor.memtrack-default /vendor/bin/hw/android.hardware.memtrack-service.sm7125
     class hal
     user nobody
     group system
diff --git a/aidl/memtrack/memtrack-exynos9810.xml b/aidl/memtrack/memtrack-sm7125.xml
similarity index 100%
rename from aidl/memtrack/memtrack-exynos9810.xml
rename to aidl/memtrack/memtrack-sm7125.xml
diff --git a/aidl/power-libperfmgr/Android.bp b/aidl/power-libperfmgr/Android.bp
index 02824bb..3d3b0cb 100644
--- a/aidl/power-libperfmgr/Android.bp
+++ b/aidl/power-libperfmgr/Android.bp
@@ -21,10 +21,10 @@ soong_namespace {
 }
 
 cc_binary {
-    name: "android.hardware.power-service.exynos9810-libperfmgr",
+    name: "android.hardware.power-service.sm7125-libperfmgr",
     relative_install_path: "hw",
-    init_rc: ["android.hardware.power-service.exynos9810-libperfmgr.rc"],
-    vintf_fragments: ["android.hardware.power-service.exynos9810.xml"],
+    init_rc: ["android.hardware.power-service.sm7125-libperfmgr.rc"],
+    vintf_fragments: ["android.hardware.power-service.sm7125.xml"],
     vendor: true,
     shared_libs: [
         "android.hardware.power-V2-ndk",
diff --git a/aidl/power-libperfmgr/PowerExt.cpp b/aidl/power-libperfmgr/PowerExt.cpp
index d31e52e..bf7da17 100644
--- a/aidl/power-libperfmgr/PowerExt.cpp
+++ b/aidl/power-libperfmgr/PowerExt.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define LOG_TAG "android.hardware.power-service.exynos9810.ext-libperfmgr"
+#define LOG_TAG "android.hardware.power-service.sm7125.ext-libperfmgr"
 
 #include "PowerExt.h"
 #include "PowerSessionManager.h"
diff --git a/aidl/power-libperfmgr/android.hardware.power-service.exynos9810-libperfmgr.rc b/aidl/power-libperfmgr/android.hardware.power-service.sm7125-libperfmgr.rc
similarity index 96%
rename from aidl/power-libperfmgr/android.hardware.power-service.exynos9810-libperfmgr.rc
rename to aidl/power-libperfmgr/android.hardware.power-service.sm7125-libperfmgr.rc
index 331c0fc..870b863 100644
--- a/aidl/power-libperfmgr/android.hardware.power-service.exynos9810-libperfmgr.rc
+++ b/aidl/power-libperfmgr/android.hardware.power-service.sm7125-libperfmgr.rc
@@ -1,4 +1,4 @@
-service vendor.power-hal-aidl /vendor/bin/hw/android.hardware.power-service.exynos9810-libperfmgr
+service vendor.power-hal-aidl /vendor/bin/hw/android.hardware.power-service.sm7125-libperfmgr
     class hal
     user root
     group system radio
diff --git a/aidl/power-libperfmgr/android.hardware.power-service.exynos9810.xml b/aidl/power-libperfmgr/android.hardware.power-service.sm7125.xml
similarity index 100%
rename from aidl/power-libperfmgr/android.hardware.power-service.exynos9810.xml
rename to aidl/power-libperfmgr/android.hardware.power-service.sm7125.xml
diff --git a/aidl/sensors/Android.bp b/aidl/sensors/Android.bp
index 2add01a..a0bec97 100755
--- a/aidl/sensors/Android.bp
+++ b/aidl/sensors/Android.bp
@@ -14,7 +14,7 @@
 // limitations under the License.
 
 cc_binary {
-    name: "android.hardware.sensors-service.exynos9810-multihal",
+    name: "android.hardware.sensors-service.sm7125-multihal",
     defaults: [
         "hidl_defaults",
     ],
@@ -26,8 +26,8 @@ cc_binary {
         "service.cpp",
     ],
     local_include_dirs: ["include"],
-    init_rc: ["android.hardware.sensors-service.exynos9810-multihal.rc"],
-    vintf_fragments: ["android.hardware.sensors-exynos9810-multihal.xml"],
+    init_rc: ["android.hardware.sensors-service.sm7125-multihal.rc"],
+    vintf_fragments: ["android.hardware.sensors-sm7125-multihal.xml"],
     header_libs: [
         "android.hardware.sensors@2.X-shared-utils",
     ],
diff --git a/aidl/sensors/android.hardware.sensors-service.exynos9810-multihal.rc b/aidl/sensors/android.hardware.sensors-service.sm7125-multihal.rc
similarity index 85%
rename from aidl/sensors/android.hardware.sensors-service.exynos9810-multihal.rc
rename to aidl/sensors/android.hardware.sensors-service.sm7125-multihal.rc
index 9cb4863..559fb52 100755
--- a/aidl/sensors/android.hardware.sensors-service.exynos9810-multihal.rc
+++ b/aidl/sensors/android.hardware.sensors-service.sm7125-multihal.rc
@@ -1,4 +1,4 @@
-service vendor.sensors-hal-multihal /vendor/bin/hw/android.hardware.sensors-service.exynos9810-multihal
+service vendor.sensors-hal-multihal /vendor/bin/hw/android.hardware.sensors-service.sm7125-multihal
     class hal
     user system
     group system wakelock context_hub input
diff --git a/aidl/sensors/android.hardware.sensors-exynos9810-multihal.xml b/aidl/sensors/android.hardware.sensors-sm7125-multihal.xml
similarity index 100%
rename from aidl/sensors/android.hardware.sensors-exynos9810-multihal.xml
rename to aidl/sensors/android.hardware.sensors-sm7125-multihal.xml
diff --git a/aidl/usb/Android.bp b/aidl/usb/Android.bp
index a8622b3..24ff7ff 100755
--- a/aidl/usb/Android.bp
+++ b/aidl/usb/Android.bp
@@ -15,10 +15,10 @@
 //
 
 cc_binary {
-    name: "android.hardware.usb-service.exynos9810",
+    name: "android.hardware.usb-service.sm7125",
     relative_install_path: "hw",
-    init_rc: ["android.hardware.usb-service.exynos9810.rc"],
-    vintf_fragments: ["android.hardware.usb-service.exynos9810.xml"],
+    init_rc: ["android.hardware.usb-service.sm7125.rc"],
+    vintf_fragments: ["android.hardware.usb-service.sm7125.xml"],
     vendor: true,
     srcs: [
         "service.cpp",
diff --git a/aidl/usb/android.hardware.usb-service.exynos9810.rc b/aidl/usb/android.hardware.usb-service.sm7125.rc
similarity index 97%
rename from aidl/usb/android.hardware.usb-service.exynos9810.rc
rename to aidl/usb/android.hardware.usb-service.sm7125.rc
index 28e6580..2b14449 100755
--- a/aidl/usb/android.hardware.usb-service.exynos9810.rc
+++ b/aidl/usb/android.hardware.usb-service.sm7125.rc
@@ -1,4 +1,4 @@
-service vendor.usb_default /vendor/bin/hw/android.hardware.usb-service.exynos9810
+service vendor.usb_default /vendor/bin/hw/android.hardware.usb-service.sm7125
     class hal
     user system
     group system
diff --git a/aidl/usb/android.hardware.usb-service.exynos9810.xml b/aidl/usb/android.hardware.usb-service.sm7125.xml
similarity index 100%
rename from aidl/usb/android.hardware.usb-service.exynos9810.xml
rename to aidl/usb/android.hardware.usb-service.sm7125.xml
diff --git a/common.mk b/common.mk
index 14a1911..b644d94 100644
--- a/common.mk
+++ b/common.mk
@@ -154,7 +154,7 @@ PRODUCT_PACKAGES += \
     android.hardware.graphics.mapper@3.0-impl-qti-display \
     android.hardware.graphics.mapper@4.0-impl-qti-display \
     vendor.qti.hardware.display.allocator-service \
-    android.hardware.memtrack-service.exynos9810 \
+    android.hardware.memtrack-service.sm7125 \
     android.hardware.renderscript@1.0-impl \
     libtinyxml \
     libtinyxml2 \
@@ -336,7 +336,7 @@ PRODUCT_COPY_FILES += \
 
 # Power
 PRODUCT_PACKAGES += \
-    android.hardware.power-service.exynos9810-libperfmgr \
+    android.hardware.power-service.sm7125-libperfmgr \
     android.hardware.power@1.2.vendor
 
 PRODUCT_COPY_FILES += \
@@ -371,7 +371,7 @@ PRODUCT_PACKAGES += \
 # Sensors
 PRODUCT_PACKAGES += \
     android.hardware.sensors@2.1-service.samsung-multihal \
-    android.hardware.sensors-service.exynos9810-multihal \
+    android.hardware.sensors-service.sm7125-multihal \
     android.hardware.sensors@2.0-ScopedWakelock.vendor \
     sensors.samsung
 
@@ -389,7 +389,7 @@ PRODUCT_PACKAGES += \
 
 # USB
 PRODUCT_PACKAGES += \
-    android.hardware.usb@1.3-service.exynos9810
+    android.hardware.usb-service.sm7125
 
 # Vibrator
 PRODUCT_PACKAGES += \
@@ -397,7 +397,7 @@ PRODUCT_PACKAGES += \
 
 # Light
 PRODUCT_PACKAGES += \
-    android.hardware.light-service.exynos9810
+    android.hardware.light-service.sm7125
 
 # Tether
 PRODUCT_PACKAGES += \
diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts
index f90b9a7..1d7b260 100644
--- a/sepolicy/vendor/file_contexts
+++ b/sepolicy/vendor/file_contexts
@@ -64,13 +64,11 @@
 /(vendor|system/vendor)/bin/hw/vendor.samsung.hardware.thermal@1.0-service                                  u:object_r:hal_thermal_default_exec:s0
 /(vendor|system/vendor)/bin/hw/android.hardware.sensors@[0-9].[0-9]-service.samsung-multihal                u:object_r:hal_sensors_default_exec:s0
 
-# WIP
-/(vendor|system/vendor)/bin/hw/android\.hardware\.light(@[0-9].[0-9])?-service\.exynos9810                 u:object_r:hal_light_default_exec:s0
-/(vendor|system/vendor)/bin/hw/android\.hardware\.vibrator(@[0-9].[0-9])?-service\.exynos9810              u:object_r:hal_vibrator_default_exec:s0
-/(vendor|system/vendor)/bin/hw/android\.hardware\.power(@[0-9]\.[0-9])?-service\.exynos9810-libperfmgr     u:object_r:hal_power_default_exec:s0
-/(vendor|system/vendor)/bin/hw/android\.hardware\.usb@[0-9]\.[0-9]-service\.exynos9810                     u:object_r:hal_usb_default_exec:s0
-/(vendor|system/vendor)/bin/hw/android\.hardware\.sensors-service(\.exynos9810-multihal)?                   u:object_r:hal_sensors_default_exec:s0
-/(vendor|system/vendor)/bin/hw/android\.hardware\.memtrack-service.exynos9810                              u:object_r:hal_memtrack_default_exec:s0
+/(vendor|system/vendor)/bin/hw/android\.hardware\.light(@[0-9].[0-9])?-service\.sm7125                      u:object_r:hal_light_default_exec:s0
+/(vendor|system/vendor)/bin/hw/android\.hardware\.power(@[0-9]\.[0-9])?-service\.sm7125-libperfmgr          u:object_r:hal_power_default_exec:s0
+/(vendor|system/vendor)/bin/hw/android\.hardware\.usb-service.sm7125                                        u:object_r:hal_usb_default_exec:s0
+/(vendor|system/vendor)/bin/hw/android\.hardware\.sensors-service(\.sm7125-multihal)?                       u:object_r:hal_sensors_default_exec:s0
+/(vendor|system/vendor)/bin/hw/android\.hardware\.memtrack-service.sm7125                                   u:object_r:hal_memtrack_default_exec:s0
 
 /(vendor|system/vendor)/bin/hw/android.hardware.vibrator-service.sm7125                                     u:object_r:hal_vibrator_default_exec:s0
 /(vendor|system/vendor)/bin/hw/android\.hardware\.health@2\.1-service-samsung                               u:object_r:hal_health_default_exec:s0