summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-01-27 06:52:17 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-01-27 06:52:17 +0000
commit403dc40081b1e9ba623715157054919cb52d460a (patch)
tree11485f7a65c2b2617c3d33b7213d27a94cd689f2
parentf7139b35e773dac3d236d165d69c79df897d3106 (diff)
parentc3010ef22133cb7f0d7a8ff7f25a7fa03c6440f5 (diff)
downloaddevice_generic_trusty-403dc40081b1e9ba623715157054919cb52d460a.tar.gz
device_generic_trusty-403dc40081b1e9ba623715157054919cb52d460a.tar.bz2
device_generic_trusty-403dc40081b1e9ba623715157054919cb52d460a.zip
Merge "Fix aosp_qemu_trusty build error" am: 78946b538d am: c3010ef221
Change-Id: I9678f1ba3483fc31a058d53c0e64adedb6071a81
-rw-r--r--qemu_trusty_base.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/qemu_trusty_base.mk b/qemu_trusty_base.mk
index d5b6e68..ea0ca16 100644
--- a/qemu_trusty_base.mk
+++ b/qemu_trusty_base.mk
@@ -121,4 +121,5 @@ PRODUCT_BOOT_JARS := \
PRODUCT_UPDATABLE_BOOT_JARS := \
com.android.conscrypt:conscrypt \
+ com.android.tethering:framework-tethering \