diff options
| author | Vladimir Marko <vmarko@google.com> | 2018-06-07 14:57:30 +0000 |
|---|---|---|
| committer | Vladimir Marko <vmarko@google.com> | 2018-06-13 13:38:30 +0100 |
| commit | 26a4cb89ffaeb93ca386cd839bcabd8a0138f044 (patch) | |
| tree | c47d48a22beb184b71a5ceb3241b961244873e28 /NativeCode.bp | |
| parent | 612de7ce4c1570388c3e89462b7cde22c8ae4d7d (diff) | |
Revert^2 "Reimplement ojluni JNI_OnLoad from scratch."
This reverts commit 70cd18f61218aa0fa8b7d3ce47b28553fd9ddca1.
The initialization order has been fixed by moving Float,
Double and System to the beginning as they are needed for
resizing StringBuilder's internal buffer, used for class
initializers of some other classes, notably Inet*Addrees.
Also change libbase to be dynamically linked to avoid
multiple definitions of gMinimumLogSeverity which caused
some tests to fail as dalvikvm would initialize a copy in
the libbase.so but JVM_Exit() would use its own copy in
the libopenjdkd.so, ignoring the requested verbosity.
Test: Pixel 2 XL boots.
Test: cts-tradefed run cts --m vm-tests-tf
Test: cts-tradefed run cts -d -m CtsLibcoreTestCases
Test: m test-art-host-gtest
Test: testrunner.py --host --optimizing
Test: Repeat previous 2 tests without preloaded-classes.
(cherry picked from commit 1ba8b2ff33dd4cd3b60a82cb49f72b35922f36c3)
Change-Id: I2e5ca42615136ad77c368fb6ab75d18dc0734800
Merged-In: I4bb977e00f5c0028cafb000d70159043c5ec9fb9
Diffstat (limited to 'NativeCode.bp')
| -rw-r--r-- | NativeCode.bp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/NativeCode.bp b/NativeCode.bp index 3780e7d432..f041bc2d63 100644 --- a/NativeCode.bp +++ b/NativeCode.bp @@ -39,11 +39,11 @@ cc_defaults { cc_defaults { name: "core_native_default_libs", static_libs: [ - "libbase", "libfdlibm", ], shared_libs: [ + "libbase", "liblog", "libnativehelper", ], @@ -61,6 +61,7 @@ cc_library_shared { ], shared_libs: [ + "libbase", "libcrypto", "libexpat", "libicuuc", @@ -70,7 +71,6 @@ cc_library_shared { ], static_libs: [ "libziparchive", - "libbase", ], target: { android: { |