diff options
| author | 2019-11-20 19:46:00 +0800 | |
|---|---|---|
| committer | 2019-12-18 13:05:30 +0000 | |
| commit | bf4be9b5b8d7ea19194e796b05e831af8a83020e (patch) | |
| tree | 25e00997fcdf5c2d2b00bc8ed78ff5edd9f93f72 | |
| parent | ced27c4c60d52c58b71d2d2dff0e90e020c62350 (diff) | |
[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
| -rw-r--r-- | target/product/base_system.mk | 8 | ||||
| -rw-r--r-- | target/product/go_defaults_common.mk | 1 |
2 files changed, 6 insertions, 3 deletions
diff --git a/target/product/base_system.mk b/target/product/base_system.mk index 95e6fb0eac..ab7fbb5c7c 100644 --- a/target/product/base_system.mk +++ b/target/product/base_system.mk @@ -60,6 +60,7 @@ PRODUCT_PACKAGES += \ com.android.neuralnetworks \ com.android.sdkext \ com.android.telephony \ + com.android.tethering \ com.android.tzdata \ ContactsProvider \ content \ @@ -103,7 +104,6 @@ PRODUCT_PACKAGES += \ incident_helper \ init.environ.rc \ init_system \ - InProcessTethering \ input \ installd \ iorapd \ @@ -326,7 +326,8 @@ PRODUCT_BOOT_JARS := \ ims-common \ framework-sdkext \ ike \ - updatable-media + updatable-media \ + framework-tethering PRODUCT_UPDATABLE_BOOT_JARS := \ com.android.conscrypt:conscrypt \ @@ -334,7 +335,8 @@ PRODUCT_UPDATABLE_BOOT_JARS := \ 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 d4655f1f00..f931f4a3f9 100644 --- a/target/product/go_defaults_common.mk +++ b/target/product/go_defaults_common.mk @@ -40,6 +40,7 @@ PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD := false # 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 |