From 71533ced02bc6cd0acbda91da4c72aaeeb86b1da Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Thu, 12 Dec 2019 13:44:39 -0800 Subject: wifi: Create test apex for install tests Also, remove redundnat "required" tag in the apex. Bug: 146163587 Test: atest wifi_e2e_tests Change-Id: I13baa920725375379de06c12f12ee07bd8d57460 --- service/apex/Android.bp | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) (limited to 'service') diff --git a/service/apex/Android.bp b/service/apex/Android.bp index fff3f2455..e9b62c5d0 100644 --- a/service/apex/Android.bp +++ b/service/apex/Android.bp @@ -14,25 +14,29 @@ // limitations under the License. // -// Mainline wifi apex module. -apex { - name: "com.android.wifi", - manifest: "apex_manifest.json", +apex_defaults { + name: "com.android.wifi-defaults", + androidManifest: ":com.android.wifi-androidManifest", native_shared_libs: ["libwifi-jni"], java_libs: ["wifi-service"], - apps: ["wifi-service-resources"], - - required: [ - "cacerts_wfa", - "services", - ], - init_rc: ["../wifi.rc"], - key: "com.android.wifi.key", certificate: ":com.android.wifi.certificate", } +filegroup { + name: "com.android.wifi-androidManifest", + srcs: ["AndroidManifest.xml"], +} + +// Mainline wifi apex module. +apex { + name: "com.android.wifi", + defaults: ["com.android.wifi-defaults"], + manifest: "apex_manifest.json", + apps: ["wifi-service-resources"], +} + apex_key { name: "com.android.wifi.key", public_key: "com.android.wifi.avbpubkey", -- cgit v1.2.3