summaryrefslogtreecommitdiff
path: root/apex
diff options
context:
space:
mode:
author David Su <dysu@google.com> 2020-01-22 14:05:28 -0800
committer David Su <dysu@google.com> 2020-01-27 13:15:04 -0800
commit7f8f5b92ce77b45200d0a6ab5a30a443934f5616 (patch)
treeb582fbf1bf0a7a6d3113e0ac7825a35114028476 /apex
parentd7f827dfafef30e11c7d178e589c4d4a2c5da207 (diff)
Move cacerts_wfa from system to Wifi APEX
This allows the WFA certificates to be updated when needed. Bug: 145199837 Test: atest android.security.cts.CertificateTest FrameworksWifiTests Test: Connected to OSU network successfully Change-Id: I63eb67c0eb520352835d1f21bf37b7d643a85393
Diffstat (limited to 'apex')
-rw-r--r--apex/Android.bp6
1 files changed, 6 insertions, 0 deletions
diff --git a/apex/Android.bp b/apex/Android.bp
index a758067a23..e143d03014 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -21,6 +21,12 @@ apex_defaults {
"wifi-service",
"framework-wifi",
],
+ // from build rule `cacerts_wfa`
+ prebuilts: [
+ "target-cacert-wifi-674b5f5b.0",
+ "target-cacert-wifi-21125ccd.0",
+ "target-cacert-wifi-ea93cb5b.0",
+ ],
init_rc: [":wifi-init-rc"],
key: "com.android.wifi.key",
certificate: ":com.android.wifi.certificate",