commit 2a6f1ed29ae4fd174104f33f57cdf2c94610cb01
author Ulya Trafimovich <skvadrik@google.com> Thu Jan 16 13:32:40 2020 +0000
committer Ulya Trafimovich <skvadrik@google.com> Thu Apr 09 10:14:25 2020 +0100
tree 64068cc7821e30abb16e44e760c084b7aa559698
parent c34e3ab2700ebfb3be4ab3c5037e2b7edc3a2503

Add conscrypt to PRODUCT_UPDATABLE_BOOT_JARS.

This was should have been done in https://r.android.com/1265301
(but was accidentally forgotten).

Test: lunch qemu_arm && m nothing

Bug: 147579140

Change-Id: I9c03715b0658529b4df66a5d7f1aefc28d210476
Merged-In: I9c03715b0658529b4df66a5d7f1aefc28d210476
(cherry picked from commit af3ae258baa5179ec9f2f9f6bfa7122091c12214)

qemu_base.mk

diff --git a/qemu_base.mk b/qemu_base.mk
index 798c87e..2a62a8d 100644
--- a/qemu_base.mk
+++ b/qemu_base.mk
@@ -115,6 +115,9 @@
 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 := \