commit 7a85e70b2bf646d1d7a226fbb4e7fafb66871dd5
author Vladimir Marko <vmarko@google.com> Mon Dec 03 18:47:23 2018 +0000
committer Vladimir Marko <vmarko@google.com> Tue Dec 04 17:17:19 2018 +0000
tree 790ee4c1cee812535c856a08355c50c2032c5cd4
parent 6a98f89c4ad645b04d6c80d3d7e260c59bf6f193

Reduce core image to 6 modules.

This was
    Revert^2 "Reduce core image to core-{oj,libart,simple}."
but we're now keeping three additional modules, namely
conscrypt, okhttp and bouncycastle. And we fix the boot
class path used by vogar with the companion change
    https://android-review.googlesource.com/840810 .

This reverts commit 00fe35e4021e9a8679eca3ffaede48fd89b56258.

Change-Id: I6137edd91c03c17be50de200267eb9adc971e8fb
Test: m test-art-host-gtest
Test: testrunner.py --host --optimizing
Test: Pixel 3 XL boots.
Test: m test-art-target-gtest
Test: testrunner.py --target --optimizing
Test: art/tools/run-libcore-tests.sh --mode=device --variant=X64
Bug: 119868597