From 3efe2941411b7f8498794b0c82e2f94d1dc981ee Mon Sep 17 00:00:00 2001 From: Jooyung Han Date: Tue, 10 Oct 2023 15:49:06 +0900 Subject: [PATCH] Cleanup: use shared apex_key (wifi HAL APEX) Bug: 296524155 Test: m Change-Id: Id1bdc3614cf0387f726211c4b8e04909879198eb --- wifi/apex/Android.bp | 19 ++----- wifi/apex/com.android.hardware.wifi.avbpubkey | Bin 1032 -> 0 bytes wifi/apex/com.android.hardware.wifi.pem | 52 ------------------ wifi/apex/com.android.hardware.wifi.pk8 | Bin 2374 -> 0 bytes wifi/apex/com.android.hardware.wifi.x509.pem | 36 ------------ 5 files changed, 4 insertions(+), 103 deletions(-) delete mode 100644 wifi/apex/com.android.hardware.wifi.avbpubkey delete mode 100644 wifi/apex/com.android.hardware.wifi.pem delete mode 100644 wifi/apex/com.android.hardware.wifi.pk8 delete mode 100644 wifi/apex/com.android.hardware.wifi.x509.pem diff --git a/wifi/apex/Android.bp b/wifi/apex/Android.bp index f8ba5c472b..f8c8e6fa70 100644 --- a/wifi/apex/Android.bp +++ b/wifi/apex/Android.bp @@ -2,17 +2,6 @@ package { default_applicable_licenses: ["hardware_interfaces_license"], } -apex_key { - name: "com.android.hardware.wifi.key", - public_key: "com.android.hardware.wifi.avbpubkey", - private_key: "com.android.hardware.wifi.pem", -} - -android_app_certificate { - name: "com.android.hardware.wifi.certificate", - certificate: "com.android.hardware.wifi", -} - genrule { name: "gen-android.hardware.wifi.rc", srcs: [":default-android.hardware.wifi-service.rc"], @@ -36,12 +25,12 @@ prebuilt_etc { apex { name: "com.android.hardware.wifi", manifest: "apex_manifest.json", - key: "com.android.hardware.wifi.key", - certificate: ":com.android.hardware.wifi.certificate", + key: "com.android.hardware.key", + certificate: ":com.android.hardware.certificate", file_contexts: "file_contexts", - use_vndk_as_stable: true, updatable: false, - soc_specific: true, + vendor: true, + binaries: [ "android.hardware.wifi-service", ], diff --git a/wifi/apex/com.android.hardware.wifi.avbpubkey b/wifi/apex/com.android.hardware.wifi.avbpubkey deleted file mode 100644 index 63fba77bb19ed65514ef1d5449f56d17c0da9998..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1032 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