Fix mac build
-z muldefs doesn't exist on mac. It is only necessary for dex2oats,
which doesn't build on mac, move it from the defaults to the dex2oats
targets.
Change-Id: I47f35d159fc0602f54412e12ef44798ca4afa4de
diff --git a/dex2oat/Android.bp b/dex2oat/Android.bp
index 6c549e6..be7f9fa 100644
--- a/dex2oat/Android.bp
+++ b/dex2oat/Android.bp
@@ -33,17 +33,6 @@
address: false,
},
},
-
- host: {
- ldflags: [
- // We need this because GC stress mode makes use of
- // _Unwind_GetIP and _Unwind_Backtrace and the symbols are also
- // defined in libgcc_eh.a(unwind-dw2.o)
- // TODO: Having this is not ideal as it might obscure errors.
- // Try to get rid of it.
- "-z muldefs",
- ],
- },
},
@@ -87,6 +76,14 @@
enabled: false,
},
},
+ ldflags: [
+ // We need this because GC stress mode makes use of
+ // _Unwind_GetIP and _Unwind_Backtrace and the symbols are also
+ // defined in libgcc_eh.a(unwind-dw2.o)
+ // TODO: Having this is not ideal as it might obscure errors.
+ // Try to get rid of it.
+ "-z muldefs",
+ ],
static_libs: [
"libart-compiler",
"libart",
@@ -108,6 +105,14 @@
enabled: false,
},
},
+ ldflags: [
+ // We need this because GC stress mode makes use of
+ // _Unwind_GetIP and _Unwind_Backtrace and the symbols are also
+ // defined in libgcc_eh.a(unwind-dw2.o)
+ // TODO: Having this is not ideal as it might obscure errors.
+ // Try to get rid of it.
+ "-z muldefs",
+ ],
static_libs: [
"libartd-compiler",
"libartd",