Merge "Link libc++ statically" into rvc-dev am: 282afacd3a am: bf993dd95c

Change-Id: I9a54171d17167198db2a607904b45acdf86035f4
This commit is contained in:
Tej Singh 2020-04-08 01:08:54 +00:00 committed by Automerger Merge Worker
commit a618183d59
2 changed files with 5 additions and 1 deletions

View File

@ -30,11 +30,11 @@ cc_defaults {
shared_libs: [
"libbinder_ndk",
"liblog",
"statsd-aidl-ndk_platform",
"libstatssocket",
],
static_libs: [
"libutils",
"statsd-aidl-ndk_platform",
],
}
cc_library_shared {
@ -53,6 +53,9 @@ cc_library_shared {
"com.android.os.statsd",
"test_com.android.os.statsd",
],
stl: "libc++_static",
// TODO(b/151102177): Enable it when the build error is fixed.
header_abi_checker: {
enabled: false,

View File

@ -54,6 +54,7 @@ cc_library {
},
},
},
stl: "libc++_static",
// enumerate stable entry points for APEX use
stubs: {