From bfc9931975f8be05aace18e21eea6eeb4d8e26cf Mon Sep 17 00:00:00 2001 From: Gabriel Biren Date: Fri, 2 Dec 2022 20:44:40 +0000 Subject: [PATCH] Update Vendor HAL APEX to use the AIDL service. Bug: 205044134 Test: Check that AIDL service is running on a Bluejay device. Change-Id: I5a09fe1a68fee871e6ff8fa338f4482500e6cf48 --- wifi/apex/Android.bp | 8 ++++---- wifi/apex/file_contexts | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/wifi/apex/Android.bp b/wifi/apex/Android.bp index 0afb96b85d..e1fefb9575 100644 --- a/wifi/apex/Android.bp +++ b/wifi/apex/Android.bp @@ -15,7 +15,7 @@ android_app_certificate { genrule { name: "gen-android.hardware.wifi.rc", - srcs: [":default-android.hardware.wifi@1.0-service.rc"], + srcs: [":default-android.hardware.wifi-service.rc"], out: ["com.android.hardware.wifi-service.rc"], cmd: "sed -e 's@/vendor/bin/@/apex/com.android.hardware.wifi/bin/@' $(in) > $(out)", } @@ -28,7 +28,7 @@ prebuilt_etc { prebuilt_etc { name: "com.android.hardware.wifi.xml", - src: ":default-android.hardware.wifi@1.0-service.xml", + src: ":default-android.hardware.wifi-service.xml", installable: false, } @@ -43,13 +43,13 @@ apex { updatable: false, soc_specific: true, binaries: [ - "android.hardware.wifi@1.0-service", + "android.hardware.wifi-service", ], prebuilts: [ "com.android.hardware.wifi.rc", "com.android.hardware.wifi.xml", ], overrides: [ - "android.hardware.wifi@1.0-service", + "android.hardware.wifi-service", ], } diff --git a/wifi/apex/file_contexts b/wifi/apex/file_contexts index 812d51db58..6368729c9a 100644 --- a/wifi/apex/file_contexts +++ b/wifi/apex/file_contexts @@ -1,3 +1,3 @@ (/.*)? u:object_r:vendor_file:s0 -/bin/hw/android\.hardware\.wifi@1.0-service u:object_r:hal_wifi_default_exec:s0 +/bin/hw/android\.hardware\.wifi-service u:object_r:hal_wifi_default_exec:s0