Merge "tp: limit max CPU number when tokenizing ftrace"
diff --git a/gn/perfetto.gni b/gn/perfetto.gni
index 98f9c1b..f59deff 100644
--- a/gn/perfetto.gni
+++ b/gn/perfetto.gni
@@ -211,7 +211,7 @@
# dllexport/import adds extra complexity for little benefit. Te only reason
# for monolithic_binaries=false is saving binary size, which matters mainly on
# Android. See also comments on PERFETTO_EXPORT_ENTRYPOINT in compiler.h.
- monolithic_binaries = is_win || is_mac
+ monolithic_binaries = !perfetto_build_with_android && (is_win || is_mac)
# Whether DLOG should be enabled on debug builds (""), all builds ("on"), or
# none ("off"). We disable it by default for embedders to avoid spamming their
diff --git a/src/trace_processor/util/profile_builder.cc b/src/trace_processor/util/profile_builder.cc
index 3682910..9459644 100644
--- a/src/trace_processor/util/profile_builder.cc
+++ b/src/trace_processor/util/profile_builder.cc
@@ -19,11 +19,11 @@
#include <cstdint>
#include <iterator>
-#include "include/perfetto/base/logging.h"
-#include "include/perfetto/ext/trace_processor/demangle.h"
+#include "perfetto/base/logging.h"
#include "perfetto/ext/base/optional.h"
#include "perfetto/ext/base/string_utils.h"
#include "perfetto/ext/base/string_view.h"
+#include "perfetto/ext/trace_processor/demangle.h"
#include "src/trace_processor/containers/string_pool.h"
#include "src/trace_processor/types/trace_processor_context.h"
