diff options
| author | Todd Frederick <tfred@google.com> | 2023-03-12 13:04:55 +0000 |
|---|---|---|
| committer | Todd Frederick <tfred@google.com> | 2023-03-13 00:41:57 +0000 |
| commit | 9a4ad7d592000ba287a7feb259978765aa29f7dd (patch) | |
| tree | 08dac24b802e07675b01fc90443e3e3b921cbdb9 | |
| parent | 7a54dcd682e0838673ba736f666d353416d860ca (diff) | |
| download | weaver-9a4ad7d592000ba287a7feb259978765aa29f7dd.tar.gz | |
Add NXP suffix
Avoid conflicts with other HAL implementations.
Bug: 270239534
Test: m
Change-Id: Iaa03335d262fcbd4ed3331594b33785af5308330
| -rw-r--r-- | 1.0/android.hardware.weaver@1.0-service.nxp.rc (renamed from 1.0/android.hardware.weaver@1.0-service.rc) | 2 | ||||
| -rw-r--r-- | 1.0/android.hardware.weaver@1.0-service.nxp.xml (renamed from 1.0/android.hardware.weaver@1.0-service.xml) | 0 | ||||
| -rwxr-xr-x | Android.bp | 8 | ||||
| -rw-r--r-- | libese_weaver/Android.bp | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/1.0/android.hardware.weaver@1.0-service.rc b/1.0/android.hardware.weaver@1.0-service.nxp.rc index e45622d..6f1efd1 100644 --- a/1.0/android.hardware.weaver@1.0-service.rc +++ b/1.0/android.hardware.weaver@1.0-service.nxp.rc @@ -1,4 +1,4 @@ -service weaver_hal_service /vendor/bin/hw/android.hardware.weaver@1.0-service +service weaver_hal_service /vendor/bin/hw/android.hardware.weaver@1.0-service.nxp class hal user vendor_nxp_weaver group system drmrpc diff --git a/1.0/android.hardware.weaver@1.0-service.xml b/1.0/android.hardware.weaver@1.0-service.nxp.xml index 51a4a04..51a4a04 100644 --- a/1.0/android.hardware.weaver@1.0-service.xml +++ b/1.0/android.hardware.weaver@1.0-service.nxp.xml @@ -1,9 +1,9 @@ cc_binary { relative_install_path: "hw", - name: "android.hardware.weaver@1.0-service", - init_rc: ["1.0/android.hardware.weaver@1.0-service.rc"], - vintf_fragments: ["1.0/android.hardware.weaver@1.0-service.xml"], + name: "android.hardware.weaver@1.0-service.nxp", + init_rc: ["1.0/android.hardware.weaver@1.0-service.nxp.rc"], + vintf_fragments: ["1.0/android.hardware.weaver@1.0-service.nxp.xml"], proprietary: true, defaults: ["hidl_defaults"], srcs: [ @@ -13,7 +13,7 @@ cc_binary { shared_libs: [ "android.hardware.weaver@1.0", - "ese_weaver", + "ese_weaver.nxp", "libcutils", "libdl", "libhardware", diff --git a/libese_weaver/Android.bp b/libese_weaver/Android.bp index ccbe425..9655745 100644 --- a/libese_weaver/Android.bp +++ b/libese_weaver/Android.bp @@ -1,6 +1,6 @@ cc_library_shared { - name: "ese_weaver", + name: "ese_weaver.nxp", defaults: ["hidl_defaults"], proprietary: true, @@ -25,7 +25,7 @@ cc_library_shared { shared_libs: [ "android.se.omapi-V1-ndk", "libcutils", - "libjc_keymint_transport", + "libjc_keymint_transport.nxp", "libhardware", "libhidlbase", "libutils", |