diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-08-28 07:37:01 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-08-28 07:37:01 +0000 |
| commit | 52c920fb2ceded026320791609b3f10d13fce381 (patch) | |
| tree | d225efa5669b4fb69fccab7c8e778fd667979f70 /cc/stl.go | |
| parent | 264bcfbaf9fbf1349a820bf1608c813b3b102af3 (diff) | |
| parent | a7282fe4466715829b0071d74c98ee423d27a516 (diff) | |
| download | build_soong-52c920fb2ceded026320791609b3f10d13fce381.tar.gz build_soong-52c920fb2ceded026320791609b3f10d13fce381.tar.bz2 build_soong-52c920fb2ceded026320791609b3f10d13fce381.zip | |
release-request-c924aaac-f0a2-4215-8dc4-e314f22460d9-for-git_oc-mr1-release-4301796 snap-temp-L23200000097143969
Change-Id: I0a82c495265904d6c7231edfc11778266f895049
Diffstat (limited to 'cc/stl.go')
| -rw-r--r-- | cc/stl.go | 12 |
1 files changed, 2 insertions, 10 deletions
@@ -107,8 +107,6 @@ func (stl *stl) deps(ctx BaseModuleContext, deps Deps) Deps { } if ctx.staticBinary() { deps.StaticLibs = append(deps.StaticLibs, "libm", "libc", "libdl") - } else { - deps.SharedLibs = append(deps.SharedLibs, "libdl") } } case "": @@ -118,15 +116,9 @@ func (stl *stl) deps(ctx BaseModuleContext, deps Deps) Deps { // The system STL doesn't have a prebuilt (it uses the system's libstdc++), but it does have // its own includes. The includes are handled in CCBase.Flags(). deps.SharedLibs = append([]string{"libstdc++"}, deps.SharedLibs...) - case "ndk_libc++_shared": - deps.SharedLibs = append(deps.SharedLibs, stl.Properties.SelectedStl, - "libdl") - case "ndk_libc++_static": - deps.StaticLibs = append(deps.StaticLibs, stl.Properties.SelectedStl) - deps.SharedLibs = append(deps.SharedLibs, "libdl") - case "ndk_libstlport_shared": + case "ndk_libc++_shared", "ndk_libstlport_shared": deps.SharedLibs = append(deps.SharedLibs, stl.Properties.SelectedStl) - case "ndk_libstlport_static", "ndk_libgnustl_static": + case "ndk_libc++_static", "ndk_libstlport_static", "ndk_libgnustl_static": deps.StaticLibs = append(deps.StaticLibs, stl.Properties.SelectedStl) default: panic(fmt.Errorf("Unknown stl: %q", stl.Properties.SelectedStl)) |