From 27279ece288e8a38e9e3dd6dd2eef86a3f58e0cb Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Wed, 28 Sep 2016 20:58:38 -0700 Subject: [PATCH] Remove shared lib name checks Now that we're no longer using -l, we don't need to strip off the "lib" prefix and ".so" suffix. Therefore we don't need to make sure the prefix and suffix exists. Bug: 31742855 Test: Attempt to link android.hardware.* (hardware/interfaces/*) Change-Id: I38555014cdc0e430f94359e173bb09e35d45c44e --- cc/builder.go | 7 ------- 1 file changed, 7 deletions(-) diff --git a/cc/builder.go b/cc/builder.go index a84ba08ea..42a7f48a6 100644 --- a/cc/builder.go +++ b/cc/builder.go @@ -377,13 +377,6 @@ func TransformObjToDynamicBinary(ctx android.ModuleContext, } for _, lib := range sharedLibs { - file := filepath.Base(lib.String()) - if !strings.HasPrefix(file, "lib") { - panic("shared library " + lib.String() + " does not start with lib") - } - if !strings.HasSuffix(file, flags.toolchain.ShlibSuffix()) { - panic("shared library " + lib.String() + " does not end with " + flags.toolchain.ShlibSuffix()) - } libFlagsList = append(libFlagsList, lib.String()) }