From ca2f39be70499bbe624cd901392e293004527232 Mon Sep 17 00:00:00 2001 From: Yu Shan Date: Fri, 22 Sep 2023 19:26:27 -0700 Subject: [PATCH] Remove remoteaccess V1 impl. We have migrated all the ref to V2. Test: Presubmit Bug: 295393732 Change-Id: I358d6380664dac13412b2706652de9726441adae --- .../remoteaccess/hal/default/Android.bp | 23 ------------------- .../remoteaccess-default-service-v1.rc | 4 ---- .../remoteaccess-default-service-v1.xml | 7 ------ .../remoteaccess-tcu-test-service-v1.rc | 5 ---- 4 files changed, 39 deletions(-) delete mode 100644 automotive/remoteaccess/hal/default/remoteaccess-default-service-v1.rc delete mode 100644 automotive/remoteaccess/hal/default/remoteaccess-default-service-v1.xml delete mode 100644 automotive/remoteaccess/hal/default/remoteaccess-tcu-test-service-v1.rc diff --git a/automotive/remoteaccess/hal/default/Android.bp b/automotive/remoteaccess/hal/default/Android.bp index 70dba3071a..97ed2c12f0 100644 --- a/automotive/remoteaccess/hal/default/Android.bp +++ b/automotive/remoteaccess/hal/default/Android.bp @@ -47,17 +47,6 @@ cc_defaults { ], } -// TODO(b/295393732): remove this once we finish the migration from V1 to V2. -cc_binary { - name: "android.hardware.automotive.remoteaccess@V1-default-service", - defaults: ["remote-access-hal-defaults"], - vintf_fragments: ["remoteaccess-default-service-v1.xml"], - init_rc: ["remoteaccess-default-service-v1.rc"], - cflags: [ - "-DGRPC_SERVICE_ADDRESS=\"10.0.2.2:50051\"", - ], -} - cc_binary { name: "android.hardware.automotive.remoteaccess@V2-default-service", defaults: ["remote-access-hal-defaults"], @@ -68,18 +57,6 @@ cc_binary { ], } -// TODO(b/295393732): remove this once we finish the migration from V1 to V2. -cc_binary { - name: "android.hardware.automotive.remoteaccess@V1-tcu-test-service", - defaults: ["remote-access-hal-defaults"], - vintf_fragments: ["remoteaccess-default-service-v1.xml"], - init_rc: ["remoteaccess-tcu-test-service-v1.rc"], - cflags: [ - "-DGRPC_SERVICE_ADDRESS=\"10.10.10.1:50051\"", - "-DGRPC_SERVICE_IFNAME=\"eth1\"", - ], -} - cc_binary { name: "android.hardware.automotive.remoteaccess@V2-tcu-test-service", defaults: ["remote-access-hal-defaults"], diff --git a/automotive/remoteaccess/hal/default/remoteaccess-default-service-v1.rc b/automotive/remoteaccess/hal/default/remoteaccess-default-service-v1.rc deleted file mode 100644 index b7a9cdc82a..0000000000 --- a/automotive/remoteaccess/hal/default/remoteaccess-default-service-v1.rc +++ /dev/null @@ -1,4 +0,0 @@ -service vendor.remoteaccess-default /vendor/bin/hw/android.hardware.automotive.remoteaccess@V1-default-service - class hal - user vehicle_network - group system inet diff --git a/automotive/remoteaccess/hal/default/remoteaccess-default-service-v1.xml b/automotive/remoteaccess/hal/default/remoteaccess-default-service-v1.xml deleted file mode 100644 index d050a1b646..0000000000 --- a/automotive/remoteaccess/hal/default/remoteaccess-default-service-v1.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - android.hardware.automotive.remoteaccess - 1 - IRemoteAccess/default - - diff --git a/automotive/remoteaccess/hal/default/remoteaccess-tcu-test-service-v1.rc b/automotive/remoteaccess/hal/default/remoteaccess-tcu-test-service-v1.rc deleted file mode 100644 index 59315ebe0b..0000000000 --- a/automotive/remoteaccess/hal/default/remoteaccess-tcu-test-service-v1.rc +++ /dev/null @@ -1,5 +0,0 @@ -service vendor.remoteaccess-default /vendor/bin/hw/android.hardware.automotive.remoteaccess@V1-tcu-test-service - class hal - user vehicle_network - group system inet - capabilities NET_RAW