summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author markchien <markchien@google.com> 2020-05-05 17:42:44 +0800
committer markchien <markchien@google.com> 2020-05-07 14:21:49 +0800
commit523616a2671c8bd3bebe6eb952c23b0b33a241e8 (patch)
treeeae2d15c6f852156ca08ff0da460532ca6eeba7f
parentcd63a66fde46277f28ef81b157a23ecffdb60d45 (diff)
Override tethering module APK-in-APEX for Go variant
Bug: 155604224 Test: build Change-Id: I4147173b5f3668491ff9cb7f1f86715b036d6d4b
-rw-r--r--packages/Tethering/Android.bp1
-rw-r--r--packages/Tethering/apex/Android.bp9
2 files changed, 10 insertions, 0 deletions
diff --git a/packages/Tethering/Android.bp b/packages/Tethering/Android.bp
index bfb65241ec6d..83f761f812e0 100644
--- a/packages/Tethering/Android.bp
+++ b/packages/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/packages/Tethering/apex/Android.bp b/packages/Tethering/apex/Android.bp
index 24df5f696077..20ccd2ad6453 100644
--- a/packages/Tethering/apex/Android.bp
+++ b/packages/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",
+ ],
+}