summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2018-12-13 22:54:13 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2018-12-13 22:54:13 +0000
commitddc3fb3dcf3dc12e0b24078dc7e9c0550112bdf6 (patch)
treed38fa010eedec1883188f54eba6555f4bb197fd9
parentada8e15c9d208c428fff4f4fa39ad807cf84c5e1 (diff)
parent58fffb452e252c1f32009e04e14c71a9520781d9 (diff)
downloadexternal_libcxx-ddc3fb3dcf3dc12e0b24078dc7e9c0550112bdf6.tar.gz
external_libcxx-ddc3fb3dcf3dc12e0b24078dc7e9c0550112bdf6.tar.bz2
external_libcxx-ddc3fb3dcf3dc12e0b24078dc7e9c0550112bdf6.zip
Merge "Fix macOS build."android-o-mr1-iot-release-1.0.8
-rw-r--r--Android.bp12
1 files changed, 8 insertions, 4 deletions
diff --git a/Android.bp b/Android.bp
index 7ba35635e..1eae90f38 100644
--- a/Android.bp
+++ b/Android.bp
@@ -150,10 +150,6 @@ cc_binary {
// http://llvm.org/bugs/show_bug.cgi?id=21421
"-O0",
],
- ldflags: [
- // This makes the tests run a little faster.
- "-Wl,--strip-all",
- ],
rtti: true,
local_include_dirs: [
"test/support",
@@ -168,6 +164,14 @@ cc_binary {
},
compile_multilib: "both",
host_supported: true,
+ target: {
+ linux: {
+ ldflags: [
+ // This makes the tests run a little faster.
+ "-Wl,--strip-all",
+ ],
+ },
+ },
gnu_extensions: false,
cpp_std: "c++17",
}