diff options
| author | Roshan Pius <rpius@google.com> | 2019-12-12 13:44:39 -0800 |
|---|---|---|
| committer | Roshan Pius <rpius@google.com> | 2019-12-12 14:54:34 -0800 |
| commit | 71533ced02bc6cd0acbda91da4c72aaeeb86b1da (patch) | |
| tree | e85b9b49d52c89f3fd6ac41be63a34a957a6ca0a /service | |
| parent | 7f68f5503380d67a5cd7c758ba493dedb00358e5 (diff) | |
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
Diffstat (limited to 'service')
| -rw-r--r-- | service/apex/Android.bp | 28 |
1 files changed, 16 insertions, 12 deletions
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", |