diff options
| author | Colin Cross <ccross@android.com> | 2019-05-29 21:39:14 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2019-05-30 18:48:51 +0000 |
| commit | 616f400313907532b9c8b78a9af503926280c1c3 (patch) | |
| tree | eb0e748c457a2d200ca271147224e10709443880 /sigchainlib | |
| parent | 10f5f86b31f36db7d053e5f0a8fa71b57beef3a6 (diff) | |
Move libsigchain out of static/shared properties
Using the static/shared properties causes Soong to skip the
optimization that reuses .o files between the static and shared
variants of a library. libart uses static.static_libs and
shared.shared_libs to select between libsigchain and
libsigchain_dummy. This doesn't actually do anything, because
dependencies from the static variant are only used to import
includes. Always use libsigchain in shared_libs, the final
binary that links against static libart will pull in the
correct libsigchain_dummy dependency through
libart_static_base_defaults. This halves the number of times
that the code in art/runtime is compiled.
Also make libsigchain and libsigchain_dummy export their includes
so that libart doesn't need to manually specify include_dirs.
Test: m libart
Change-Id: I83b02001d698bb9c9e26fd1467283116356b5bf1
Diffstat (limited to 'sigchainlib')
| -rw-r--r-- | sigchainlib/Android.bp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sigchainlib/Android.bp b/sigchainlib/Android.bp index 3209478747..31a8f3dfbc 100644 --- a/sigchainlib/Android.bp +++ b/sigchainlib/Android.bp @@ -37,6 +37,8 @@ cc_library { whole_static_libs: ["libasync_safe"], }, }, + + export_include_dirs: ["."], } // Create a dummy version of libsigchain which expose the necessary symbols @@ -52,6 +54,8 @@ cc_library_static { whole_static_libs: ["libasync_safe"], }, }, + + export_include_dirs: ["."], } art_cc_test { |