diff options
| author | Roshan Pius <rpius@google.com> | 2019-12-13 16:39:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-12-13 16:39:41 +0000 |
| commit | cdf50099aceca8271b620588ad48ee0d7e2f3cc4 (patch) | |
| tree | 7f280df6e4995f7db70230ebb3d8eaf19ceeb17b /service | |
| parent | e08d5a9e2ba89d9f25e7486145e97ae4ca8d45c1 (diff) | |
| parent | 71533ced02bc6cd0acbda91da4c72aaeeb86b1da (diff) | |
Merge "wifi: Create test apex for install tests"
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", |