summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-13 14:01:30 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-13 14:01:30 +0000
commit2ed06bace7b12e97ce8bbc999b0c38dbb3a70130 (patch)
treea81c133037e9333f61a00f4c68fe9179ae06593d
parentf7deb7c1b723b89467c51ecb1356b47127e1ef69 (diff)
parent1976d96d705ca163686a35d09b214e959d22449f (diff)
downloaddevice_generic_trusty-2ed06bace7b12e97ce8bbc999b0c38dbb3a70130.tar.gz
device_generic_trusty-2ed06bace7b12e97ce8bbc999b0c38dbb3a70130.tar.bz2
device_generic_trusty-2ed06bace7b12e97ce8bbc999b0c38dbb3a70130.zip
Make PRODUCT_BOOT_JARS and PRODUCT_UPDATABLE_BOOT_JARS disjoint. am: 00b6489cbb am: 1976d96d70
Change-Id: I959036a54bc007dbe599b301c7d8b2faf05585f6
-rw-r--r--qemu_trusty_base.mk2
1 files changed, 0 insertions, 2 deletions
diff --git a/qemu_trusty_base.mk b/qemu_trusty_base.mk
index 7b789e5..f8cf3ff 100644
--- a/qemu_trusty_base.mk
+++ b/qemu_trusty_base.mk
@@ -108,13 +108,11 @@ PRODUCT_BOOT_JARS := \
core-oj \
core-libart \
core-icu4j \
- conscrypt \
okhttp \
bouncycastle \
apache-xml \
ext \
framework-minus-apex \
- framework-tethering \
telephony-common \
voip-common \
ims-common \