From 2a6f1ed29ae4fd174104f33f57cdf2c94610cb01 Mon Sep 17 00:00:00 2001 From: Ulya Trafimovich Date: Thu, 16 Jan 2020 13:32:40 +0000 Subject: 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 | 3 +++ 1 file changed, 3 insertions(+) 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 @@ 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 := \ -- cgit v1.2.3