diff options
| author | Jeongik Cha <jeongik@google.com> | 2019-02-22 18:36:33 +0900 |
|---|---|---|
| committer | Jeongik Cha <jeongik@google.com> | 2019-02-22 18:42:32 +0900 |
| commit | e072e6cd193728e0bba96dac334bdf1e028194bc (patch) | |
| tree | e87ff974de5780ee354af05c75511bfbb378cf6a /build/properties.go | |
| parent | 54fa1e0b02f136fb7d545d4a0e800d8ea66f22fb (diff) | |
| download | aidl-e072e6cd193728e0bba96dac334bdf1e028194bc.tar.gz | |
link libjsoncpp as whole_static_lib when aidl is statically linked
aidl_interface includes libjsoncpp when turn on gen_log option.
when aidl_interface lib is statically imported by other module,
the module has to link libjsoncpp regardless of usage of the library.
so link libjsoncpp as whole_static_lib in this case.
https://android-review.googlesource.com/c/platform/system/netd/+/853730/11/Android.bp#35
Bug: 124871490
Test: m -j
Change-Id: Ia18b8d6c7a3a94ac10d7efde4383097d480d74a6
Diffstat (limited to 'build/properties.go')
| -rw-r--r-- | build/properties.go | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/build/properties.go b/build/properties.go index 79295a2e..13f1705a 100644 --- a/build/properties.go +++ b/build/properties.go @@ -17,7 +17,14 @@ package aidl type nameProperties struct { Name *string } +type staticLib struct { + Whole_static_libs []string +} +type sharedLib struct { + Shared_libs []string + Export_shared_lib_headers []string +} type ccProperties struct { Name *string Owner *string @@ -25,6 +32,8 @@ type ccProperties struct { Vendor_available *bool Generated_sources []string Generated_headers []string + Shared sharedLib + Static staticLib Shared_libs []string Export_shared_lib_headers []string Export_generated_headers []string |