diff options
| author | Jiyong Park <jiyong@google.com> | 2018-12-15 14:07:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-12-15 14:07:42 +0000 |
| commit | 2da5ebf382f75483eefbd8deb7ea7ba0532ab790 (patch) | |
| tree | 6d6f7f39e33ac20092fc295f44587879b75cc018 /build | |
| parent | 4aef28ae893990b409bb705c5f7646f1bd8e6737 (diff) | |
| parent | 3296fb1332a7a53d4e05371d55b5135c6d67505e (diff) | |
| download | art-2da5ebf382f75483eefbd8deb7ea7ba0532ab790.tar.gz art-2da5ebf382f75483eefbd8deb7ea7ba0532ab790.tar.bz2 art-2da5ebf382f75483eefbd8deb7ea7ba0532ab790.zip | |
Merge "Bionic libs are explicitly added to runtime APEX"
Diffstat (limited to 'build')
| -rw-r--r-- | build/apex/Android.bp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/build/apex/Android.bp b/build/apex/Android.bp index f2e12f6a77..0ec0a15e9e 100644 --- a/build/apex/Android.bp +++ b/build/apex/Android.bp @@ -19,6 +19,11 @@ art_runtime_base_native_shared_libs = [ "libopenjdkjvmti", "libadbconnection", ] +bionic_native_shared_libs = [ + "libc", + "libm", + "libdl", +] // - Fake library that avoids namespace issues and gives some warnings for nosy apps. art_runtime_fake_native_shared_libs = [ // FIXME: Does not work as-is, because `libart_fake` is defined in libart_fake/Android.mk, @@ -102,7 +107,8 @@ apex { compile_multilib: "both", manifest: "manifest.json", native_shared_libs: art_runtime_base_native_shared_libs - + art_runtime_fake_native_shared_libs, + + art_runtime_fake_native_shared_libs + + bionic_native_shared_libs, multilib: { both: { // TODO: Add logic to create a `dalvikvm` symlink to `dalvikvm32` or `dalvikvm64` @@ -130,7 +136,8 @@ apex { manifest: "manifest.json", native_shared_libs: art_runtime_base_native_shared_libs + art_runtime_fake_native_shared_libs - + art_runtime_debug_native_shared_libs, + + art_runtime_debug_native_shared_libs + + bionic_native_shared_libs, multilib: { both: { // TODO: Add logic to create a `dalvikvm` symlink to `dalvikvm32` or `dalvikvm64` |