Merge "Link libc++ statically" into rvc-dev am: 282afacd3a
am: bf993dd95c
Change-Id: I9a54171d17167198db2a607904b45acdf86035f4
This commit is contained in:
commit
a618183d59
|
@ -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,
|
||||
|
|
|
@ -54,6 +54,7 @@ cc_library {
|
|||
},
|
||||
},
|
||||
},
|
||||
stl: "libc++_static",
|
||||
|
||||
// enumerate stable entry points for APEX use
|
||||
stubs: {
|
||||
|
|
Loading…
Reference in New Issue