diff --git a/cc/fuzz.go b/cc/fuzz.go index c1754b2da..d44c02de6 100644 --- a/cc/fuzz.go +++ b/cc/fuzz.go @@ -17,6 +17,7 @@ package cc import ( "android/soong/android" "android/soong/cc/config" + "github.com/google/blueprint/proptools" ) func init() { @@ -120,5 +121,16 @@ func NewFuzz(hod android.HostOrDeviceSupported) *Module { ctx.AppendProperties(&disableDarwinAndLinuxBionic) }) + // Statically link the STL. This allows fuzz target deployment to not have to + // include the STL. + android.AddLoadHook(module, func(ctx android.LoadHookContext) { + staticStlLinkage := struct { + Stl *string + }{} + + staticStlLinkage.Stl = proptools.StringPtr("libc++_static") + ctx.AppendProperties(&staticStlLinkage) + }) + return module }