From b30b027fe44ceda5396f3a12b5ff9138e50fabed Mon Sep 17 00:00:00 2001 From: Cosmin Tanislav Date: Tue, 21 Sep 2021 01:58:57 +0300 Subject: [PATCH] rosemary: sensors: Avoid target name conflicts Change-Id: I170c8c7e4edbfcdebf5d6f6df148b72993d805f6 --- device.mk | 2 +- sensors/Android.bp | 2 +- sensors/android.hardware.sensors@2.1-service-multihal.rc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/device.mk b/device.mk index 02a1e51..07e894d 100644 --- a/device.mk +++ b/device.mk @@ -436,7 +436,7 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ android.frameworks.sensorservice@1.0 \ android.frameworks.sensorservice@1.0.vendor \ - android.hardware.sensors@2.1-service.multihal \ + android.hardware.sensors@2.1-service.rosemary-multihal \ android.hardware.sensors@1.0.vendor \ android.hardware.sensors@2.0.vendor \ android.hardware.sensors@2.1.vendor \ diff --git a/sensors/Android.bp b/sensors/Android.bp index 6a7cac9..71153f6 100644 --- a/sensors/Android.bp +++ b/sensors/Android.bp @@ -14,7 +14,7 @@ // limitations under the License. cc_binary { - name: "android.hardware.sensors@2.1-service.multihal", + name: "android.hardware.sensors@2.1-service.rosemary-multihal", defaults: [ "hidl_defaults", ], diff --git a/sensors/android.hardware.sensors@2.1-service-multihal.rc b/sensors/android.hardware.sensors@2.1-service-multihal.rc index fc99ee7..6334554 100644 --- a/sensors/android.hardware.sensors@2.1-service-multihal.rc +++ b/sensors/android.hardware.sensors@2.1-service-multihal.rc @@ -1,4 +1,4 @@ -service vendor.sensors-hal-2-1-multihal /vendor/bin/hw/android.hardware.sensors@2.1-service.multihal +service vendor.sensors-hal-2-1-multihal /vendor/bin/hw/android.hardware.sensors@2.1-service.rosemary-multihal class hal user system group system wakelock context_hub