diff options
| author | 2019-10-16 20:28:54 +0000 | |
|---|---|---|
| committer | 2019-10-16 20:28:54 +0000 | |
| commit | 98eccba8b4bea1a069f68d4a605e9e83f2e86860 (patch) | |
| tree | 4f718989e40a5d02d961c392b2b955d5b5831dd6 | |
| parent | 83246459d1905ba83ddb73b20d9ef448f2ac06e9 (diff) | |
| parent | 302f964aa05f3b1e29a00cbce08b5d83b480c581 (diff) | |
Merge "Do not link libc++.so statically on device."
| -rw-r--r-- | cc/fuzz.go | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/cc/fuzz.go b/cc/fuzz.go index c19fdc5b0..b8b9c7140 100644 --- a/cc/fuzz.go +++ b/cc/fuzz.go @@ -148,10 +148,14 @@ func NewFuzz(hod android.HostOrDeviceSupported) *Module { // include the STL. android.AddLoadHook(module, func(ctx android.LoadHookContext) { staticStlLinkage := struct { - Stl *string + 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) }) |