commit e3a2db866142ec00f8e07a2700dddcb5aa99d65d
author Vladimir Marko <vmarko@google.com> Fri Dec 21 15:53:17 2018 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Fri Jan 11 10:27:17 2019 +0000
tree c45138d1ca2cc6f113df3ebd5cfbd35d0605cc37
parent 1951e7041644a350ffc80be9ff5754918cf4b5a3

Remove conscrypt from boot image.

But keep it as part of the boot class path and deliver the
dex files uncompressed in /system/framework/conscrypt.jar.

Test: Pixel 2 XL boots.
Bug: 119868597
Change-Id: I41b96a586401d120998be5a111331935030922c6

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index 31c77d4..534a5eb 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -111,6 +111,9 @@
 $(call add_json_bool, UncompressPrivAppDex,              $(call invert_bool,$(filter true,$(DONT_UNCOMPRESS_PRIV_APPS_DEXS))))
 $(call add_json_list, ModulesLoadedByPrivilegedModules,  $(PRODUCT_LOADED_BY_PRIVILEGED_MODULES))
 
+$(call add_json_list, BootJars,                          $(PRODUCT_BOOT_JARS))
+$(call add_json_list, PreoptBootJars,                    $(DEXPREOPT_BOOT_JARS_MODULES))
+
 $(call add_json_bool, DisableDexPreopt,                  $(call invert_bool,$(filter true,$(WITH_DEXPREOPT))))
 $(call add_json_list, DisableDexPreoptModules,           $(DEXPREOPT_DISABLED_MODULES))
 $(call add_json_str,  DexPreoptProfileDir,               $(PRODUCT_DEX_PREOPT_PROFILE_DIR))