[Tether16] Build Tethering package
Create com.android.tethering apex to pack Tethering.apk and
framework-tethering.jar together.
For go devices, tethering would run in system server process by
InProcessTethering.apk
Bug: 144320246
Test: -build, boot
Change-Id: Id2d68117e99173682908168e99ee28670bd71871
Merged-In: Id2d68117e99173682908168e99ee28670bd71871
diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 95e6fb0..ab7fbb5 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -60,6 +60,7 @@
com.android.neuralnetworks \
com.android.sdkext \
com.android.telephony \
+ com.android.tethering \
com.android.tzdata \
ContactsProvider \
content \
@@ -103,7 +104,6 @@
incident_helper \
init.environ.rc \
init_system \
- InProcessTethering \
input \
installd \
iorapd \
@@ -326,7 +326,8 @@
ims-common \
framework-sdkext \
ike \
- updatable-media
+ updatable-media \
+ framework-tethering
PRODUCT_UPDATABLE_BOOT_JARS := \
com.android.conscrypt:conscrypt \
@@ -334,7 +335,8 @@
com.android.media:updatable-media \
com.android.sdkext:framework-sdkext \
com.android.telephony:telephony-common \
- com.android.telephony:ims-common
+ com.android.telephony:ims-common \
+ com.android.tethering:framework-tethering
PRODUCT_COPY_FILES += \
system/core/rootdir/init.usb.rc:system/etc/init/hw/init.usb.rc \
diff --git a/target/product/go_defaults_common.mk b/target/product/go_defaults_common.mk
index d4655f1..f931f4a 100644
--- a/target/product/go_defaults_common.mk
+++ b/target/product/go_defaults_common.mk
@@ -40,6 +40,7 @@
# Do not spin up a separate process for the network stack on go devices, use an in-process APK.
PRODUCT_PACKAGES += InProcessNetworkStack
PRODUCT_PACKAGES += CellBroadcastAppPlatform
+PRODUCT_PACKAGES += InProcessTethering
# Strip the local variable table and the local variable type table to reduce
# the size of the system image. This has no bearing on stack traces, but will