From 9548c8580c0bedad6ae78f6fec96cab924dffcf2 Mon Sep 17 00:00:00 2001
From: markchien <markchien@google.com>
Date: Tue, 5 May 2020 17:42:44 +0800
Subject: [PATCH] Override tethering module APK-in-APEX for Go variant

Bug: 155604224
Test: build
Change-Id: I4147173b5f3668491ff9cb7f1f86715b036d6d4b
---
 Tethering/Android.bp      | 1 +
 Tethering/apex/Android.bp | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/Tethering/Android.bp b/Tethering/Android.bp
index bfb65241ec..83f761f812 100644
--- a/Tethering/Android.bp
+++ b/Tethering/Android.bp
@@ -109,6 +109,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
diff --git a/Tethering/apex/Android.bp b/Tethering/apex/Android.bp
index 24df5f6960..20ccd2ad64 100644
--- 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",
+    ],
+}