Refactor linker files from compiler/ to dex2oat/.
This shifts some code from the libart-compiler.so to dex2oat
and reduces memory needed for JIT. We also avoid loading the
libart-dexlayout.so for JIT but the memory savings are
minimal (one shared clean page, two shared dirty pages and
some per-app kernel mmap data) as the code has never been
needed in memory by JIT.
aosp_angler-userdebug file sizes (stripped):
lib64/libart-compiler.so: 2989112 -> 2671888 (-310KiB)
lib/libart-compiler.so: 2160816 -> 1939276 (-216KiB)
bin/dex2oat: 141868 -> 368808 (+222KiB)
LOAD/executable elf mapping sizes:
lib64/libart-compiler.so: 2866308 -> 2555500 (-304KiB)
lib/libart-compiler.so: 2050960 -> 1834836 (-211KiB)
bin/dex2oat: 129316 -> 345916 (+212KiB)
Test: m test-art-host-gtest
Test: testrunner.py --host
Test: cd art/; mma; cd -
Change-Id: If62f02847a6cbb208eaf7e1f3e91af4663fa4a5f
diff --git a/build/art.go b/build/art.go
index 19b39cd..1bcaf51 100644
--- a/build/art.go
+++ b/build/art.go
@@ -261,6 +261,7 @@
func init() {
android.RegisterModuleType("art_cc_library", artLibrary)
+ android.RegisterModuleType("art_cc_static_library", artStaticLibrary)
android.RegisterModuleType("art_cc_binary", artBinary)
android.RegisterModuleType("art_cc_test", artTest)
android.RegisterModuleType("art_cc_test_library", artTestLibrary)
@@ -292,8 +293,18 @@
}
func artLibrary() android.Module {
- library, _ := cc.NewLibrary(android.HostAndDeviceSupported)
- module := library.Init()
+ m, _ := cc.NewLibrary(android.HostAndDeviceSupported)
+ module := m.Init()
+
+ installCodegenCustomizer(module, true)
+
+ return module
+}
+
+func artStaticLibrary() android.Module {
+ m, library := cc.NewLibrary(android.HostAndDeviceSupported)
+ library.BuildOnlyStatic()
+ module := m.Init()
installCodegenCustomizer(module, true)