Merge "Fix mac build" am: b278a58325

am: 5eb6315022

Change-Id: I4acd473fd43cab7434a7f520d73ae2c844c76287
This commit is contained in:
Colin Cross 2016-12-06 04:48:38 +00:00 committed by android-build-merger
commit 964b062941

View file

@ -466,11 +466,11 @@ func TransformObjToDynamicBinary(ctx android.ModuleContext,
}
}
if flags.groupStaticLibs && len(staticLibs) > 0 {
if flags.groupStaticLibs && !ctx.Darwin() && len(staticLibs) > 0 {
libFlagsList = append(libFlagsList, "-Wl,--start-group")
}
libFlagsList = append(libFlagsList, staticLibs.Strings()...)
if flags.groupStaticLibs && len(staticLibs) > 0 {
if flags.groupStaticLibs && !ctx.Darwin() && len(staticLibs) > 0 {
libFlagsList = append(libFlagsList, "-Wl,--end-group")
}