symbolizer: Fix symlink handling
It turns out that the symbolizer used fts_open() for a reason:
base::ListFilesRecursive doesn't handle symlinks. Turns out that
handling symlinks is non-trivial because we have to prevent infinite
loops. fts_open() does all that for us. This commit:
* Reverts a bunch of commits:
* ee90928bb222("Move GetFileSize() from symbolizer to base/file_utils.h")
* ad3da2777b62("Revert "Link against libfts when compiling against musl"")
* 2abbc726fa5a("Avoid using fts_open and fts_read")
* Cherrypicks a fix from base::ListFilesRecursive from commit
63ad74ac51b7 ("Do not use ScopedResource for FindFirstFile handle")
* Adds unittests with symlinks.
Tested by:
* Building and running unittests on windows
* Building and running unintests on Linux
* Building in CI android musl:
https://android-build.googleplex.com/builds/abtd/run/L35900000958749217
Bug: 261712935
Change-Id: Ibdf87f05394f1922430dd5513e5d53848096d7d7
diff --git a/tools/gen_android_bp b/tools/gen_android_bp
index e8a5677..b7da65d 100755
--- a/tools/gen_android_bp
+++ b/tools/gen_android_bp
@@ -117,6 +117,12 @@
],
}
+needs_libfts = [
+ '//:perfetto_unittests',
+ '//src/trace_processor:trace_processor_shell',
+ '//src/traceconv:traceconv',
+]
+
# All module names are prefixed with this string to avoid collisions.
module_prefix = 'perfetto_'
@@ -507,6 +513,7 @@
self.tool_files: Optional[List[str]] = None
self.android = Target('android')
self.host = Target('host')
+ self.musl = Target('musl')
self.lto: Optional[bool] = None
self.stl = None
self.dist = dict()
@@ -568,6 +575,7 @@
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:
@@ -985,6 +993,9 @@
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))
