summaryrefslogtreecommitdiff
path: root/apex
diff options
context:
space:
mode:
author Jiakai Zhang <jiakaiz@google.com> 2021-12-21 18:59:45 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-12-21 18:59:45 +0000
commit3696ab9f28c6e84b7f9776d8952bf548cd2cbd3a (patch)
tree04f31bf292bf2391a8548ac58e8f4bfbab471c3b /apex
parent80e4cc33bb3feb3591e171ba75ad8b34c8ca7b24 (diff)
parentb7ce1b0c2b8c4fada0e04975023e784958f953aa (diff)
Dexopt service-wifi. am: c13f2db9cb am: 3e1fee95fc am: 67d2162681 am: b7ce1b0c2b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Wifi/+/1906158 Change-Id: I431b813cad25c7781ec9206ce4ed9d1c503667fd
Diffstat (limited to 'apex')
-rw-r--r--apex/Android.bp11
1 files changed, 8 insertions, 3 deletions
diff --git a/apex/Android.bp b/apex/Android.bp
index be0767bc3e..231de3eab2 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -22,9 +22,7 @@ apex_defaults {
name: "com.android.wifi-defaults",
androidManifest: ":com.android.wifi-androidManifest",
bootclasspath_fragments: ["com.android.wifi-bootclasspath-fragment"],
- java_libs: [
- "service-wifi",
- ],
+ systemserverclasspath_fragments: ["com.android.wifi-systemserverclasspath-fragment"],
// from build rule `cacerts_wfa`
prebuilts: [
"target-cacert-wifi-674b5f5b.0",
@@ -70,6 +68,7 @@ android_app_certificate {
sdk {
name: "wifi-module-sdk",
bootclasspath_fragments: ["com.android.wifi-bootclasspath-fragment"],
+ systemserverclasspath_fragments: ["com.android.wifi-systemserverclasspath-fragment"],
}
// Encapsulate the contributions made by the com.android.wifi to the bootclasspath.
@@ -100,3 +99,9 @@ bootclasspath_fragment {
unsupported: ["hiddenapi/hiddenapi-unsupported.txt"],
},
}
+
+systemserverclasspath_fragment {
+ name: "com.android.wifi-systemserverclasspath-fragment",
+ standalone_contents: ["service-wifi"],
+ apex_available: ["com.android.wifi"],
+}