summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlyana Trafimovich <skvadrik@google.com>2020-04-08 12:43:10 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-04-08 12:43:10 +0000
commit63c275674d2c90924423a28e96fa8e651bc44919 (patch)
treea9708b68ab06fa21a0389249372f1a4d61dd8c2f
parentca2c961523c33a3aef39637ab70ff56a68556eb2 (diff)
parent92634235266e8549b9c32935a6855cda25541e4a (diff)
downloadqemu-63c275674d2c90924423a28e96fa8e651bc44919.tar.gz
Merge "Add conscrypt to PRODUCT_UPDATABLE_BOOT_JARS." am: ae87e924d3 am: 9263423526
Change-Id: I2f5a539bec2e10f86ab043ec869b7452ad293890
-rw-r--r--qemu_base.mk3
1 files changed, 3 insertions, 0 deletions
diff --git a/qemu_base.mk b/qemu_base.mk
index e76219d..5657336 100644
--- a/qemu_base.mk
+++ b/qemu_base.mk
@@ -115,6 +115,9 @@ endif
PRODUCT_BOOT_JARS := \
$(ART_APEX_JARS) \
+PRODUCT_UPDATABLE_BOOT_JARS := \
+ com.android.conscrypt:conscrypt \
+
# The set of packages we want to force 'speed' compilation on.
PRODUCT_DEXPREOPT_SPEED_APPS := \