Merge "Override tethering module APK-in-APEX for Go variant" am: bfd392c4c0

Change-Id: Iff6db0c1f58356a0e573654175c3780b8fa09a66
2020-05-08 12:29:38 +00:00
parent b51ef98b86 bfd392c4c0
commit b8345314d8
2 changed files with 10 additions and 0 deletions
--- a/Tethering/Android.bp
+++ b/Tethering/Android.bp
@@ -113,6 +113,7 @@ android_app {
    manifest: "AndroidManifest_InProcess.xml",
    // InProcessTethering is a replacement for Tethering
    overrides: ["Tethering"],
+    apex_available: ["com.android.tethering"],
 }

 // Updatable tethering packaged as an application
--- a/Tethering/apex/Android.bp
+++ b/Tethering/apex/Android.bp
@@ -36,3 +36,12 @@ android_app_certificate {
    name: "com.android.tethering.certificate",
    certificate: "com.android.tethering",
 }
+
+override_apex {
+    name: "com.android.tethering.inprocess",
+    base: "com.android.tethering",
+    package_name: "com.android.tethering.inprocess",
+    apps: [
+        "InProcessTethering",
+    ],
+}