Merge "Do not link libc++.so statically on device."

am: 98eccba8b4

Change-Id: I5decbaf3ae182910d10851f185681dc111ba0b93
This commit is contained in:
Mitch Phillips
2019-10-16 13:48:36 -07:00
committed by android-build-merger

View File

@@ -148,10 +148,14 @@ func NewFuzz(hod android.HostOrDeviceSupported) *Module {
// include the STL.
android.AddLoadHook(module, func(ctx android.LoadHookContext) {
staticStlLinkage := struct {
Target struct {
Linux_glibc struct {
Stl *string
}
}
}{}
staticStlLinkage.Stl = proptools.StringPtr("libc++_static")
staticStlLinkage.Target.Linux_glibc.Stl = proptools.StringPtr("libc++_static")
ctx.AppendProperties(&staticStlLinkage)
})