3 files changed, 48 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",
diff --git a/tests/wifitests/apex/Android.bp b/tests/wifitests/apex/Android.bp
new file mode 100644
index 000000000..13b188044
--- /dev/null
+++ b/tests/wifitests/apex/Android.bp
@@ -0,0 +1,28 @@
+// Copyright (C) 2019 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// A test version of wifi apex.
+// It has a version code that should beat a "real" APEX and enables end-to-end
+// installation testing on devices with the latests real data.
+apex {
+    name: "test_com.android.wifi",
+    visibility: [
+        "//system/apex/tests",
+    ],
+    defaults: ["com.android.wifi-defaults"],
+    manifest: "test_apex_manifest.json",
+    file_contexts: ":com.android.wifi-file_contexts",
+    // Test APEX, should never be installed
+    installable: false,
+}
diff --git a/tests/wifitests/apex/test_apex_manifest.json b/tests/wifitests/apex/test_apex_manifest.json
new file mode 100644
index 000000000..3272a0d90
--- /dev/null
+++ b/tests/wifitests/apex/test_apex_manifest.json
@@ -0,0 +1,4 @@
+{
+  "name": "com.android.wifi",
+  "version": 2147483647
+}