Use GNU basename(3) in perf(1) now bionic has it.
This brings us another step closer to upstream.
Bug: 11860789
Change-Id: I90fbcda69cd794b6dedbc38a56700ca4de73b7bd
diff --git a/perf-3.12.0/tools/perf/util/dso.c b/perf-3.12.0/tools/perf/util/dso.c
index 3fcaf59..e3c1ff8 100644
--- a/perf-3.12.0/tools/perf/util/dso.c
+++ b/perf-3.12.0/tools/perf/util/dso.c
@@ -381,32 +381,7 @@
static void dso__set_basename(struct dso *dso)
{
-#if defined(__BIONIC__)
- /*
- * This code assumes the <string.h> basename but bionic
- * only has the <libgen.h> kind. Fake it. http://b/11860789.
- */
-
- char *lname = strdup(dso->long_name);
- if (!lname)
- return;
-
- /*
- * basename may return pointer to internal
- * storage which is reused in subsequent calls
- * so copy the result
- */
- char *base = strdup(basename(lname));
-
- free(lname);
-
- if (!base)
- return;
-
- dso__set_short_name(dso, base);
-#else
dso__set_short_name(dso, basename(dso->long_name));
-#endif
}
int dso__name_len(const struct dso *dso)