From 3895d5b2461c5f62c18a9337ea43fbe6b6de4131 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Wed, 14 Sep 2016 16:50:48 -0700 Subject: [PATCH] Always link libdl with libc++ for the NDK. Soong change to match https://android-review.googlesource.com/#/c/274447/. Test: make checkbuild tests Bug: None Change-Id: I25bfed6d99b97c406f40892ae4abc38f4e656e81 --- cc/stl.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/cc/stl.go b/cc/stl.go index a7e362c8a..874e7ae74 100644 --- a/cc/stl.go +++ b/cc/stl.go @@ -114,9 +114,15 @@ 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", "ndk_libstlport_shared": + 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": deps.SharedLibs = append(deps.SharedLibs, stl.Properties.SelectedStl) - case "ndk_libc++_static", "ndk_libstlport_static", "ndk_libgnustl_static": + case "ndk_libstlport_static", "ndk_libgnustl_static": deps.StaticLibs = append(deps.StaticLibs, stl.Properties.SelectedStl) default: panic(fmt.Errorf("Unknown stl: %q", stl.Properties.SelectedStl))