Rename wifi-service-resources to ServiceWifiResources

- ServiceWifi instead of wifi-service to be consistent
  with naming conventions for service jars
- CamelCase to be consistent with other APKs

Also added apex_available to ServiceWifiResources.

Bug: 149589553
Test: compiles
Change-Id: I2060d3eeb2a127fa17a2cabf09d7ef303a5ce391

3 files changed, 8 insertions, 6 deletions

diff --git a/service/Android.bp b/service/Android.bp
index 928f9c554..fb5861d21 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/apex/Android.bp b/service/apex/Android.bp
index 65cd6d573..e23d9cc8f 100644
--- a/service/apex/Android.bp
+++ b/service/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/tests/wifitests/Android.bp b/tests/wifitests/Android.bp
index 4d808b70c..7fd2a5f75 100644
--- a/tests/wifitests/Android.bp
+++ b/tests/wifitests/Android.bp
@@ -86,7 +86,7 @@ android_test {
         "jsr305",
         "services",
         // load the resources from the resources APK.
-        "wifi-service-resources",
+        "ServiceWifiResources",
         "unsupportedappusage",
     ],