summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlyana Trafimovich <skvadrik@google.com>2020-04-08 12:29:10 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-04-08 12:29:10 +0000
commit92634235266e8549b9c32935a6855cda25541e4a (patch)
treed18c9807deed5574ed8138e1635d41eea9c86d55
parent4a895ff48483afda497c35ce0f4e7d1d46d87444 (diff)
parentae87e924d3a6f771df97004d14f843584d22ec6f (diff)
downloadqemu-92634235266e8549b9c32935a6855cda25541e4a.tar.gz
Merge "Add conscrypt to PRODUCT_UPDATABLE_BOOT_JARS." am: ae87e924d3
Change-Id: Ia67417e2dbca07cf42370a7889e16038de5dc94c
-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 := \