diff options
| author | 2020-04-08 00:52:20 +0000 | |
|---|---|---|
| committer | 2020-04-08 00:52:20 +0000 | |
| commit | a916e8c69222b3150cdc87cba3228f72a0dd089d (patch) | |
| tree | dd0c112bdd834c6ce2e7a67c242816c6491704ea | |
| parent | 4dec7281869a9b302b683f5a488d5d95146f1076 (diff) | |
| parent | fa49ff93f97f13e377ff726722cdbd808c82fb7f (diff) | |
Merge "Move proto, c++, and test libs to static" into rvc-dev am: fa49ff93f9
Change-Id: If2b720f783a3c6b6841ccd5992af279b29bff473
| -rw-r--r-- | apex/statsd/Android.bp | 1 | ||||
| -rw-r--r-- | cmds/statsd/Android.bp | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/apex/statsd/Android.bp b/apex/statsd/Android.bp index 32e13e31eebe..15d74951019d 100644 --- a/apex/statsd/Android.bp +++ b/apex/statsd/Android.bp @@ -67,7 +67,6 @@ cc_library_shared { "liblog", // Has a stable abi - should not be copied into apex. "libstatssocket", ], - //TODO: is libc++_static correct? stl: "libc++_static", cflags: [ "-Wall", diff --git a/cmds/statsd/Android.bp b/cmds/statsd/Android.bp index d3d7e1d483e8..65061d0c9bda 100644 --- a/cmds/statsd/Android.bp +++ b/cmds/statsd/Android.bp @@ -113,17 +113,18 @@ cc_defaults { static_libs: [ "libbase", "libcutils", + "libgtest_prod", "libprotoutil", "libstatsmetadata", "libstatslog_statsd", "libsysutils", "libutils", + "statsd-aidl-ndk_platform", ], shared_libs: [ "libbinder_ndk", "libincident", "liblog", - "statsd-aidl-ndk_platform", ], } @@ -268,10 +269,11 @@ cc_binary { proto: { type: "lite", + static: true, }, + stl: "libc++_static", shared_libs: [ - "libgtest_prod", "libstatssocket", ], |