diff options
| -rw-r--r-- | apex/Android.bp | 2 | ||||
| -rw-r--r-- | service/Android.bp | 10 | ||||
| -rw-r--r-- | service/tests/wifitests/Android.bp | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/apex/Android.bp b/apex/Android.bp index 65cd6d573e..e23d9cc8f9 100644 --- a/apex/Android.bp +++ b/apex/Android.bp @@ -30,8 +30,8 @@ apex_defaults { key: "com.android.wifi.key", certificate: ":com.android.wifi.certificate", apps: [ - "wifi-service-resources", "OsuLogin", + "ServiceWifiResources", ], } diff --git a/service/Android.bp b/service/Android.bp index 928f9c5543..fb5861d214 100644 --- a/service/Android.bp +++ b/service/Android.bp @@ -58,7 +58,7 @@ java_library { "jsr305", "framework-annotations-lib", // load the resources from the resources APK. - "wifi-service-resources", + "ServiceWifiResources", // need pre-jarjar symbols so that wifi-service can reference the original class names at // compile time "framework-wifi-pre-jarjar", @@ -143,11 +143,9 @@ genrule { } // APK to hold all the wifi overlayable resources. -// TODO: This should be signed by a wifi specific certificate. // ============================================================ android_app { - // TODO: Rename to service-wifi-resources? What about b/151678653? - name: "wifi-service-resources", + name: "ServiceWifiResources", defaults: ["wifi-service-common"], resource_dirs: [ "res", @@ -156,6 +154,10 @@ android_app { sdk_version: "system_current", export_package_resources: true, manifest: "AndroidManifest_Resources.xml", + apex_available: [ + "com.android.wifi", + "test_com.android.wifi", + ], } // Prebuilt for the wifi.rc file. diff --git a/service/tests/wifitests/Android.bp b/service/tests/wifitests/Android.bp index 4d808b70c8..7fd2a5f75e 100644 --- a/service/tests/wifitests/Android.bp +++ b/service/tests/wifitests/Android.bp @@ -86,7 +86,7 @@ android_test { "jsr305", "services", // load the resources from the resources APK. - "wifi-service-resources", + "ServiceWifiResources", "unsupportedappusage", ], |