Revert "Link against libfts when compiling against musl"
This reverts commit b39ae485a46b1f17e32d498d70ef969d82e672c0.
libfts should now be unused, we can remove the dependency.
Bug: 200136875
Change-Id: I7974db18eb31de6897c5211b86dab02130967b77
diff --git a/Android.bp b/Android.bp
index 2632320..7827482 100644
--- a/Android.bp
+++ b/Android.bp
@@ -9555,13 +9555,6 @@
"src/traced/probes/filesystem/testdata/**/*",
"src/traced/probes/ftrace/test/data/**/*",
],
- target: {
- musl: {
- static_libs: [
- "libfts",
- ],
- },
- },
}
// GN: //src/protozero/protoc_plugin:protozero_plugin
@@ -9739,11 +9732,6 @@
],
},
},
- musl: {
- static_libs: [
- "libfts",
- ],
- },
},
}
@@ -9878,13 +9866,6 @@
"-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER",
"-DHAVE_HIDDEN",
],
- target: {
- musl: {
- static_libs: [
- "libfts",
- ],
- },
- },
}
// GN: //src/traced/service:traced
diff --git a/tools/gen_android_bp b/tools/gen_android_bp
index 82fe1f1..53dfbc0 100755
--- a/tools/gen_android_bp
+++ b/tools/gen_android_bp
@@ -98,12 +98,6 @@
'//src/trace_processor:trace_processor_shell',
]
-needs_libfts = [
- '//:perfetto_unittests',
- '//src/trace_processor:trace_processor_shell',
- '//tools/trace_to_text:trace_to_text',
-]
-
# All module names are prefixed with this string to avoid collisions.
module_prefix = 'perfetto_'
@@ -478,7 +472,6 @@
self.tool_files = None
self.android = Target('android')
self.host = Target('host')
- self.musl = Target('musl')
self.lto = None
self.stl = None
self.dist = dict()
@@ -534,7 +527,6 @@
target_out = []
self._output_field(target_out, 'android')
self._output_field(target_out, 'host')
- self._output_field(target_out, 'musl')
if target_out:
output.append(' target: {')
for line in target_out:
@@ -871,9 +863,6 @@
for src in target.sources
if is_supported_source_file(src))
- if name_without_toolchain in needs_libfts:
- module.musl.static_libs.add('libfts')
-
if target.type in gn_utils.LINKER_UNIT_TYPES:
module.cflags.update(_get_cflags(target))
