summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYabin Cui <yabinc@google.com>2022-01-25 13:35:24 -0800
committerYabin Cui <yabinc@google.com>2022-01-25 13:35:24 -0800
commitdf13edfced5002bf5274d2dff541db58aaa7ecca (patch)
treec79edb784d2776a1d453700a91f48fe4146f1668
parent17fc71870f3f98dcca010e951633965010e885e3 (diff)
downloadextras-df13edfced5002bf5274d2dff541db58aaa7ecca.tar.gz
simpleperf: don't statically link libc++ on darwin.
Statically linking libc++ causes segfault when loading libsimpleperf_report.dylib to python on darwin. So switch to shared libc++ on darwin. But for linux and windows host, we still need libc++_static to avoid missing "libc++.so" error. Bug: 216316914 Test: run scripts/test/test.py Change-Id: I32d399a33678c4d97e3f04aa4a30db72e42da560
-rw-r--r--simpleperf/Android.bp3
1 files changed, 2 insertions, 1 deletions
diff --git a/simpleperf/Android.bp b/simpleperf/Android.bp
index 62d5ef79..ba4ef198 100644
--- a/simpleperf/Android.bp
+++ b/simpleperf/Android.bp
@@ -128,11 +128,12 @@ cc_defaults {
"libc",
],
},
- host: {
+ linux_glibc_x86_64: {
stl: "libc++_static",
},
windows: {
enabled: true,
+ stl: "libc++_static",
},
},
use_version_lib: true,