Add 'vendor.' prefix to a vendor HAL service name
To prevent property name collisions between properties of system and
vendor, 'vendor.' prefix must be added to a vendor HAL service name.
You can see the details in http://go/treble-sysprop-compatibility.
Test: succeeded building and tested on a walleye device
Bug: 36796459
Change-Id: Idc995c550657feca5e0f934444a31805bc3538f9
diff --git a/dumpstate/android.hardware.dumpstate@1.0-service.wahoo.rc b/dumpstate/android.hardware.dumpstate@1.0-service.wahoo.rc
index 924782f..39a9618 100644
--- a/dumpstate/android.hardware.dumpstate@1.0-service.wahoo.rc
+++ b/dumpstate/android.hardware.dumpstate@1.0-service.wahoo.rc
@@ -1,4 +1,4 @@
-service dumpstate-1-0 /vendor/bin/hw/android.hardware.dumpstate@1.0-service.wahoo
+service vendor.dumpstate-1-0 /vendor/bin/hw/android.hardware.dumpstate@1.0-service.wahoo
class hal
user system
group system
diff --git a/init.hardware.rc b/init.hardware.rc
index 08fd26e..64ea6d7 100644
--- a/init.hardware.rc
+++ b/init.hardware.rc
@@ -200,9 +200,9 @@
# Start services for bootanim
start surfaceflinger
start bootanim
- start hwcomposer-2-1
- start configstore-hal
- start gralloc-2-0
+ start vendor.hwcomposer-2-1
+ start vendor.configstore-hal
+ start vendor.gralloc-2-0
# Mount RW partitions which need run fsck
mount_all /vendor/etc/fstab.${ro.hardware} --late
diff --git a/power/android.hardware.power@1.1-service.wahoo.rc b/power/android.hardware.power@1.1-service.wahoo.rc
index 064cf35..cb31655 100644
--- a/power/android.hardware.power@1.1-service.wahoo.rc
+++ b/power/android.hardware.power@1.1-service.wahoo.rc
@@ -1,4 +1,4 @@
-service power-hal-1-1 /vendor/bin/hw/android.hardware.power@1.1-service.wahoo
+service vendor.power-hal-1-1 /vendor/bin/hw/android.hardware.power@1.1-service.wahoo
class hal
user system
group system
diff --git a/thermal/android.hardware.thermal@1.0-service.wahoo.rc b/thermal/android.hardware.thermal@1.0-service.wahoo.rc
index e522cb1..2dd296d 100644
--- a/thermal/android.hardware.thermal@1.0-service.wahoo.rc
+++ b/thermal/android.hardware.thermal@1.0-service.wahoo.rc
@@ -1,4 +1,4 @@
-service thermal-hal-1-0 /vendor/bin/hw/android.hardware.thermal@1.0-service.wahoo
+service vendor.thermal-hal-1-0 /vendor/bin/hw/android.hardware.thermal@1.0-service.wahoo
class hal
user nobody
group nobody
diff --git a/usb/android.hardware.usb@1.1-service.wahoo.rc b/usb/android.hardware.usb@1.1-service.wahoo.rc
index 1451519..1bb4977 100644
--- a/usb/android.hardware.usb@1.1-service.wahoo.rc
+++ b/usb/android.hardware.usb@1.1-service.wahoo.rc
@@ -1,4 +1,4 @@
-service usb-hal-1-1 /vendor/bin/hw/android.hardware.usb@1.1-service.wahoo
+service vendor.usb-hal-1-1 /vendor/bin/hw/android.hardware.usb@1.1-service.wahoo
class hal
user root
group root system
diff --git a/vibrator/android.hardware.vibrator@1.1-service.wahoo.rc b/vibrator/android.hardware.vibrator@1.1-service.wahoo.rc
index f9db6b0..be266ba 100644
--- a/vibrator/android.hardware.vibrator@1.1-service.wahoo.rc
+++ b/vibrator/android.hardware.vibrator@1.1-service.wahoo.rc
@@ -1,4 +1,4 @@
-service vibrator-1-1 /vendor/bin/hw/android.hardware.vibrator@1.1-service.wahoo
+service vendor.vibrator-1-1 /vendor/bin/hw/android.hardware.vibrator@1.1-service.wahoo
class hal
user system
group system
diff --git a/vr/android.hardware.vr@1.0-service.wahoo.rc b/vr/android.hardware.vr@1.0-service.wahoo.rc
index 7a66e90..3f34675 100644
--- a/vr/android.hardware.vr@1.0-service.wahoo.rc
+++ b/vr/android.hardware.vr@1.0-service.wahoo.rc
@@ -1,4 +1,4 @@
-service vr-wahoo-1-0 /vendor/bin/hw/android.hardware.vr@1.0-service.wahoo
+service vendor.vr-wahoo-1-0 /vendor/bin/hw/android.hardware.vr@1.0-service.wahoo
class hal
user system
group system
diff --git a/wifi_offload/android.hardware.wifi.offload@1.0-service.rc b/wifi_offload/android.hardware.wifi.offload@1.0-service.rc
index 84e0391..58b4560 100644
--- a/wifi_offload/android.hardware.wifi.offload@1.0-service.rc
+++ b/wifi_offload/android.hardware.wifi.offload@1.0-service.rc
@@ -1,4 +1,4 @@
-service offload-hal-1-0 /vendor/bin/hw/android.hardware.wifi.offload@1.0-service
+service vendor.offload-hal-1-0 /vendor/bin/hw/android.hardware.wifi.offload@1.0-service
class hal
user wifi
group wifi system
