vibrator: Rename from Wahoo to DRV2624

Bug: 132131929 Test: PTS, VTS, Manual Change-Id: I1e1d89180e4da80afbd20591c782220daaa64184 Signed-off-by: Harpreet "Eli" Sangha <eliptus@google.com>
2026-02-01 07:50:47 +00:00 · 2019-05-24 12:35:23 +09:00
parent 6d9398384e
commit 35777c03c6
11 changed files with 25 additions and 21 deletions
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -204,3 +204,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.po

 # Remove obsolete android.hardware.boot@1.0-impl-wrapper.recovery.so
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/system/lib64/hw/android.hardware.boot@1.0-impl-wrapper.recovery.so)
+
+# Vibrator HAL 1.2 renamed from 'wahoo' to 'drv2624'
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.vibrator@1.2-service.wahoo.rc)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.vibrator@1.2-service.wahoo)
--- a/device.mk
+++ b/device.mk
@@ -447,7 +447,7 @@ PRODUCT_PACKAGES += \

 # Vibrator HAL
 PRODUCT_PACKAGES += \
-    android.hardware.vibrator@1.2-service.wahoo
+    android.hardware.vibrator@1.2-service.drv2624

 # Thermal HAL
 PRODUCT_PACKAGES += \
--- a/sepolicy/vendor/file_contexts
+++ b/sepolicy/vendor/file_contexts
@@ -187,7 +187,7 @@
 /vendor/bin/hw/android\.hardware\.drm@1\.2-service-lazy\.clearkey     u:object_r:hal_drm_clearkey_exec:s0
 /vendor/bin/hw/android\.hardware\.drm@1\.2-service\.widevine          u:object_r:hal_drm_widevine_exec:s0
 /vendor/bin/hw/android\.hardware\.drm@1\.2-service-lazy\.widevine     u:object_r:hal_drm_widevine_exec:s0
-/vendor/bin/hw/android\.hardware\.vibrator@1\.2-service\.wahoo        u:object_r:hal_vibrator_default_exec:s0
+/vendor/bin/hw/android\.hardware\.vibrator@1\.2-service\.drv2624      u:object_r:hal_vibrator_default_exec:s0
 /vendor/bin/hw/android\.hardware\.health@2\.0-service\.wahoo          u:object_r:hal_health_default_exec:s0
 /vendor/bin/hw/android\.hardware\.keymaster@3\.0-service-qti         u:object_r:hal_keymaster_qti_exec:s0
 /vendor/bin/hw/android\.hardware\.gatekeeper@1\.0-service-qti        u:object_r:hal_gatekeeper_qti_exec:s0
--- a/vibrator/Android.bp
+++ b/vibrator/Android.bp
@@ -14,7 +14,7 @@
 // limitations under the License.

 cc_defaults {
-    name: "android.hardware.vibrator@1.2-defaults.wahoo",
+    name: "android.hardware.vibrator@1.2-defaults.drv2624",
    defaults: ["hidl_defaults"],
    relative_install_path: "hw",
    shared_libs: [
@@ -33,8 +33,8 @@ cc_defaults {
 }

 cc_library {
-    name: "android.hardware.vibrator@1.2-impl.wahoo",
-    defaults: ["android.hardware.vibrator@1.2-defaults.wahoo"],
+    name: "android.hardware.vibrator@1.2-impl.drv2624",
+    defaults: ["android.hardware.vibrator@1.2-defaults.drv2624"],
    srcs: [
        "Hardware.cpp",
        "Vibrator.cpp",
@@ -42,23 +42,23 @@ cc_library {
 }

 cc_binary {
-    name: "android.hardware.vibrator@1.2-service.wahoo",
-    defaults: ["android.hardware.vibrator@1.2-defaults.wahoo"],
-    init_rc: ["android.hardware.vibrator@1.2-service.wahoo.rc"],
+    name: "android.hardware.vibrator@1.2-service.drv2624",
+    defaults: ["android.hardware.vibrator@1.2-defaults.drv2624"],
+    init_rc: ["android.hardware.vibrator@1.2-service.drv2624.rc"],
    srcs: ["service.cpp"],
-    static_libs: ["android.hardware.vibrator@1.2-impl.wahoo"],
+    static_libs: ["android.hardware.vibrator@1.2-impl.drv2624"],
 }

 cc_test {
-    name: "PtsVibratorHalWahooTestSuite",
-    defaults: ["android.hardware.vibrator@1.2-defaults.wahoo"],
+    name: "PtsVibratorHalDrv2624TestSuite",
+    defaults: ["android.hardware.vibrator@1.2-defaults.drv2624"],
    srcs: [
        "tests/test-hwapi.cpp",
        "tests/test-hwcal.cpp",
        "tests/test-vibrator.cpp",
    ],
    static_libs: [
-        "android.hardware.vibrator@1.2-impl.wahoo",
+        "android.hardware.vibrator@1.2-impl.drv2624",
        "libgmock",
    ],
    shared_libs: [
--- a/vibrator/AndroidTest.xml
+++ b/vibrator/AndroidTest.xml
@@ -14,15 +14,15 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<configuration description="Runs PtsVibratorHalWahooTestSuite.">
+<configuration description="Runs PtsVibratorHalDrv2624TestSuite.">
    <option name="test-suite-tag" value="pts" />
    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
        <option name="append-bitness" value="true" />
        <option name="cleanup" value="true" />
-        <option name="push" value="PtsVibratorHalWahooTestSuite->/data/local/tmp/PtsVibratorHalWahooTestSuite" />
+        <option name="push" value="PtsVibratorHalDrv2624TestSuite->/data/local/tmp/PtsVibratorHalDrv2624TestSuite" />
    </target_preparer>
    <test class="com.android.tradefed.testtype.GTest" >
-        <option name="module-name" value="PtsVibratorHalWahooTestSuite" />
+        <option name="module-name" value="PtsVibratorHalDrv2624TestSuite" />
        <option name="native-test-device-path" value="/data/local/tmp" />
    </test>
 </configuration>
--- a/vibrator/Hardware.cpp
+++ b/vibrator/Hardware.cpp
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-#define LOG_TAG "android.hardware.vibrator@1.2-service.wahoo"
+#define LOG_TAG "android.hardware.vibrator@1.2-service.drv2624"

 #include "Hardware.h"

--- a/vibrator/android.hardware.vibrator@1.2-service.drv2624.rc
+++ b/vibrator/android.hardware.vibrator@1.2-service.drv2624.rc
@@ -1,4 +1,4 @@
-service vendor.vibrator-1-2 /vendor/bin/hw/android.hardware.vibrator@1.2-service.wahoo
+service vendor.vibrator-1-2 /vendor/bin/hw/android.hardware.vibrator@1.2-service.drv2624
    class hal
    user system
    group system
--- a/vibrator/service.cpp
+++ b/vibrator/service.cpp
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-#define LOG_TAG "android.hardware.vibrator@1.2-service.wahoo"
+#define LOG_TAG "android.hardware.vibrator@1.2-service.drv2624"

 #include <android/hardware/vibrator/1.2/IVibrator.h>
 #include <hidl/HidlSupport.h>
--- a/vibrator/tests/test-hwapi.cpp
+++ b/vibrator/tests/test-hwapi.cpp
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-#define LOG_TAG "PtsVibratorHalWahooTestSuite"
+#define LOG_TAG "PtsVibratorHalDrv2624TestSuite"

 #include <android-base/file.h>
 #include <gtest/gtest.h>
--- a/vibrator/tests/test-hwcal.cpp
+++ b/vibrator/tests/test-hwcal.cpp
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-#define LOG_TAG "PtsVibratorHalWahooTestSuite"
+#define LOG_TAG "PtsVibratorHalDrv2624TestSuite"

 #include <android-base/file.h>
 #include <android-base/properties.h>
--- a/vibrator/tests/test-vibrator.cpp
+++ b/vibrator/tests/test-vibrator.cpp
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-#define LOG_TAG "PtsVibratorHalWahooTestSuite"
+#define LOG_TAG "PtsVibratorHalDrv2624TestSuite"

 #include <android-base/logging.h>
 #include <gmock/gmock.h>