Merge "Remove version script hack for libclang_rt.* libs" into main
diff --git a/cc/prebuilt.go b/cc/prebuilt.go
index ba4c662..96a07bc 100644
--- a/cc/prebuilt.go
+++ b/cc/prebuilt.go
@@ -16,7 +16,6 @@
import (
"path/filepath"
- "strings"
"github.com/google/blueprint/depset"
"github.com/google/blueprint/proptools"
@@ -120,22 +119,6 @@
// Stub variants will create a stub .so file from stub .c files
if p.buildStubs() && objs.objFiles != nil {
// TODO (b/275273834): Make objs.objFiles == nil a hard error when the symbol files have been added to module sdk.
-
- // The map.txt files of libclang_rt.* contain version information, but the checked in .so files do not.
- // e.g. libclang_rt.* libs impl
- // $ nm -D prebuilts/../libclang_rt.hwasan-aarch64-android.so
- // __hwasan_init
-
- // stubs generated from .map.txt
- // $ nm -D out/soong/.intermediates/../<stubs>/libclang_rt.hwasan-aarch64-android.so
- // __hwasan_init@@LIBCLANG_RT_ASAN
-
- // Special-case libclang_rt.* libs to account for this discrepancy.
- // TODO (spandandas): Remove this special case https://r.android.com/3236596 has been submitted, and a new set of map.txt
- // files of libclang_rt.* libs have been generated.
- if strings.Contains(ctx.ModuleName(), "libclang_rt.") {
- p.versionScriptPath = android.OptionalPathForPath(nil)
- }
return p.linkShared(ctx, flags, deps, objs)
}