commit e9709db85ca95f1cc0cc65d9a2a0928ea9184841
author Eric Seckler <eseckler@google.com> Fri Nov 08 19:04:00 2019 +0000
committer Eric Seckler <eseckler@google.com> Fri Nov 08 19:41:21 2019 +0000
tree c33c2c9f156628841cbd54e67ac3730892cd94e1
parent 6a4520edecbd819d65a179e31c2d0eac37a9c29e

processor: Build all of TP on chrome desktop platforms

UBSAN builds in chromium (desktop only?) are complaining about missing
type info when attempting to build perfetto_unittests.

This is a short-term workaround to make the bots green again, real
fix TBC later.

Bug: chromium:1022386
TBR: primiano@google.com
Change-Id: I4e490571c6ebf200ea5115abade4661a82b81ddf

gn/perfetto.gni

diff --git a/gn/perfetto.gni b/gn/perfetto.gni
index 0e96e07..4dbcd42 100644
--- a/gn/perfetto.gni
+++ b/gn/perfetto.gni
@@ -194,7 +194,7 @@
 declare_args() {
   # Enables the SQL query layer of trace processor.
   enable_perfetto_trace_processor_sqlite =
-      enable_perfetto_trace_processor && !build_with_chromium
+      enable_perfetto_trace_processor && !(build_with_chromium && is_android)
 
   # Enables the optional SQLite percentile module.
   enable_perfetto_trace_processor_percentile =
@@ -207,23 +207,23 @@
 
   # Enables ftrace support in the trace processor.
   enable_perfetto_trace_processor_ftrace =
-      enable_perfetto_trace_processor && !build_with_chromium
+      enable_perfetto_trace_processor && !(build_with_chromium && is_android)
 
   # Enables parsing support for system probes in trace processor.
   enable_perfetto_trace_processor_system_probes =
-      enable_perfetto_trace_processor && !build_with_chromium
+      enable_perfetto_trace_processor && !(build_with_chromium && is_android)
 
   # Enables parsing support for android system probes in trace processor.
   enable_perfetto_trace_processor_android_probes =
-      enable_perfetto_trace_processor && !build_with_chromium
+      enable_perfetto_trace_processor && !(build_with_chromium && is_android)
 
   # Enables parsing support for heap graphs in trace processor.
   enable_perfetto_trace_processor_heap_graphs =
-      enable_perfetto_trace_processor && !build_with_chromium
+      enable_perfetto_trace_processor && !(build_with_chromium && is_android)
 
   # Enables graphics event support in the trace processor.
   enable_perfetto_trace_processor_graphics =
-      enable_perfetto_trace_processor && !build_with_chromium
+      enable_perfetto_trace_processor && !(build_with_chromium && is_android)
 
   # Enables JSON support in the trace processor. Required for JSON trace import
   # and export. Importer support can also be disabled using
@@ -233,7 +233,7 @@
 
   # Enables Fuchsia trace format support in trace processor.
   enable_perfetto_trace_processor_fuchsia =
-      enable_perfetto_trace_processor && !build_with_chromium
+      enable_perfetto_trace_processor && !(build_with_chromium && is_android)
 
   # Enables httpd RPC support in the trace processor.
   # Further per-OS conditionals are applied in gn/BUILD.gn.
@@ -244,7 +244,8 @@
 declare_args() {
   # Enables importer support for JSON traces in the trace processor.
   enable_perfetto_trace_processor_json_import =
-      enable_perfetto_trace_processor_json && !build_with_chromium
+      enable_perfetto_trace_processor_json &&
+      !(build_with_chromium && is_android)
 
   # Enables syscall support in trace processor. Required for ftrace, system
   # probes, and android probes support.