Add all platform files to symbolizer build
The posix files will build for all but the windows platform.
The windows files will only build for the windows platform.
Change-Id: I0534020a39bf495c8320d1d54e4660fada64a7d4
diff --git a/Android.bp b/Android.bp
index 9b85dde..e027b58 100644
--- a/Android.bp
+++ b/Android.bp
@@ -6757,9 +6757,12 @@
name: "perfetto_src_profiling_symbolizer_symbolizer",
srcs: [
"src/profiling/symbolizer/filesystem_posix.cc",
+ "src/profiling/symbolizer/filesystem_windows.cc",
"src/profiling/symbolizer/local_symbolizer.cc",
"src/profiling/symbolizer/scoped_read_mmap_posix.cc",
+ "src/profiling/symbolizer/scoped_read_mmap_windows.cc",
"src/profiling/symbolizer/subprocess_posix.cc",
+ "src/profiling/symbolizer/subprocess_windows.cc",
"src/profiling/symbolizer/symbolizer.cc",
],
}
diff --git a/BUILD b/BUILD
index 4dd68d7..104b5bb 100644
--- a/BUILD
+++ b/BUILD
@@ -694,12 +694,15 @@
srcs = [
"src/profiling/symbolizer/filesystem.h",
"src/profiling/symbolizer/filesystem_posix.cc",
+ "src/profiling/symbolizer/filesystem_windows.cc",
"src/profiling/symbolizer/local_symbolizer.cc",
"src/profiling/symbolizer/local_symbolizer.h",
"src/profiling/symbolizer/scoped_read_mmap.h",
"src/profiling/symbolizer/scoped_read_mmap_posix.cc",
+ "src/profiling/symbolizer/scoped_read_mmap_windows.cc",
"src/profiling/symbolizer/subprocess.h",
"src/profiling/symbolizer/subprocess_posix.cc",
+ "src/profiling/symbolizer/subprocess_windows.cc",
"src/profiling/symbolizer/symbolizer.cc",
"src/profiling/symbolizer/symbolizer.h",
],
diff --git a/src/profiling/symbolizer/BUILD.gn b/src/profiling/symbolizer/BUILD.gn
index 2129cb3..6989d0a 100644
--- a/src/profiling/symbolizer/BUILD.gn
+++ b/src/profiling/symbolizer/BUILD.gn
@@ -19,31 +19,20 @@
public_deps = [ "../../../include/perfetto/ext/base" ]
deps = [ "../../../gn:default_deps" ]
sources = [
+ "filesystem.h",
+ "filesystem_posix.cc",
+ "filesystem_windows.cc",
"local_symbolizer.cc",
"local_symbolizer.h",
+ "scoped_read_mmap.h",
+ "scoped_read_mmap_posix.cc",
+ "scoped_read_mmap_windows.cc",
+ "subprocess.h",
+ "subprocess_posix.cc",
+ "subprocess_windows.cc",
"symbolizer.cc",
"symbolizer.h",
]
- if (is_linux || is_mac || is_android) {
- sources += [
- "filesystem.h",
- "filesystem_posix.cc",
- "scoped_read_mmap.h",
- "scoped_read_mmap_posix.cc",
- "subprocess.h",
- "subprocess_posix.cc",
- ]
- }
- if (is_win) {
- sources += [
- "filesystem.h",
- "filesystem_windows.cc",
- "scoped_read_mmap.h",
- "scoped_read_mmap_windows.cc",
- "subprocess.h",
- "subprocess_windows.cc",
- ]
- }
}
source_set("symbolize_database") {
diff --git a/src/profiling/symbolizer/filesystem_posix.cc b/src/profiling/symbolizer/filesystem_posix.cc
index d8c6e12..a968a2d 100644
--- a/src/profiling/symbolizer/filesystem_posix.cc
+++ b/src/profiling/symbolizer/filesystem_posix.cc
@@ -16,6 +16,7 @@
#include "src/profiling/symbolizer/filesystem.h"
+#if !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
#if PERFETTO_BUILDFLAG(PERFETTO_LOCAL_SYMBOLIZER)
#include <fts.h>
#include <sys/stat.h>
@@ -65,3 +66,5 @@
} // namespace profiling
} // namespace perfetto
+
+#endif // !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
diff --git a/src/profiling/symbolizer/filesystem_windows.cc b/src/profiling/symbolizer/filesystem_windows.cc
index 362e4bf..c039958 100644
--- a/src/profiling/symbolizer/filesystem_windows.cc
+++ b/src/profiling/symbolizer/filesystem_windows.cc
@@ -16,6 +16,8 @@
#include "src/profiling/symbolizer/filesystem.h"
+#if PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
+
#define WIN32_MEAN_AND_LEAN
#include <Windows.h>
@@ -68,4 +70,6 @@
}
} // namespace profiling
-} // namespace perfetto
\ No newline at end of file
+} // namespace perfetto
+
+#endif // PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
diff --git a/src/profiling/symbolizer/scoped_read_mmap_posix.cc b/src/profiling/symbolizer/scoped_read_mmap_posix.cc
index 93944fc..cb1abe4 100644
--- a/src/profiling/symbolizer/scoped_read_mmap_posix.cc
+++ b/src/profiling/symbolizer/scoped_read_mmap_posix.cc
@@ -16,6 +16,8 @@
#include "src/profiling/symbolizer/scoped_read_mmap.h"
+#if !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
+
#include "perfetto/base/logging.h"
#include <sys/mman.h>
@@ -43,3 +45,5 @@
} // namespace profiling
} // namespace perfetto
+
+#endif // !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
diff --git a/src/profiling/symbolizer/scoped_read_mmap_windows.cc b/src/profiling/symbolizer/scoped_read_mmap_windows.cc
index 7c55e66..cebfc59 100644
--- a/src/profiling/symbolizer/scoped_read_mmap_windows.cc
+++ b/src/profiling/symbolizer/scoped_read_mmap_windows.cc
@@ -17,6 +17,8 @@
#include "src/profiling/symbolizer/scoped_read_mmap.h"
+#if PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
+
#define WIN32_MEAN_AND_LEAN
#include <Windows.h>
@@ -59,4 +61,6 @@
}
} // namespace profiling
-} // namespace perfetto
\ No newline at end of file
+} // namespace perfetto
+
+#endif // PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
diff --git a/src/profiling/symbolizer/subprocess_posix.cc b/src/profiling/symbolizer/subprocess_posix.cc
index 7d262a8..26408a8 100644
--- a/src/profiling/symbolizer/subprocess_posix.cc
+++ b/src/profiling/symbolizer/subprocess_posix.cc
@@ -16,6 +16,8 @@
#include "src/profiling/symbolizer/subprocess.h"
+#if !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
+
#include <signal.h>
#include <sys/types.h>
#include <sys/wait.h>
@@ -72,3 +74,5 @@
} // namespace profiling
} // namespace perfetto
+
+#endif // !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
diff --git a/src/profiling/symbolizer/subprocess_windows.cc b/src/profiling/symbolizer/subprocess_windows.cc
index 2fa9ca3..e6ef41a 100644
--- a/src/profiling/symbolizer/subprocess_windows.cc
+++ b/src/profiling/symbolizer/subprocess_windows.cc
@@ -17,6 +17,8 @@
#include "src/profiling/symbolizer/subprocess.h"
+#if PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
+
#include <sstream>
#include <string>
#define WIN32_MEAN_AND_LEAN
@@ -125,3 +127,5 @@
} // namespace profiling
} // namespace perfetto
+
+#endif // PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)