Revert "IWYU for SkTraceEventCommon.h" This reverts commit 5dfd4ec7529dc25ae38975320ebf82c370f584a8. Reason for revert: Android failing with a new error (these two headers are interdependent). Proposing I86027d51eadf704feef664ae06b7e937e895b8bb instead to unblock. Original change's description: > IWYU for SkTraceEventCommon.h > > Needs to include SkTraceEvent.h when SK_ANDROID_FRAMEWORK_USE_PERFETTO > is defined to pick up TRACE_STR_COPY. The Skia into Android roll is > currently failing due to some change causing TRACE_STR_COPY to not be > accidentially included first. > > Change-Id: I9cfe21f58df52b11a8095e595cdc8e3433e1f96a > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/980156 > Commit-Queue: Ben Wagner <bungeman@google.com> > Reviewed-by: Daniel Dilan <danieldilan@google.com> No-Presubmit: true No-Tree-Checks: true No-Try: true Change-Id: I72f4fd17ea4ff7d4b8fda8bd01014ce5c51c5fe8 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/980216 Reviewed-by: Noelle Scobie <nscobie@google.com> Auto-Submit: Noelle Scobie <nscobie@google.com> Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
diff --git a/src/core/SkTraceEventCommon.h b/src/core/SkTraceEventCommon.h index 84fd95b..e6cd5a2 100644 --- a/src/core/SkTraceEventCommon.h +++ b/src/core/SkTraceEventCommon.h
@@ -92,8 +92,6 @@ #ifdef SK_ANDROID_FRAMEWORK_USE_PERFETTO -#include "src/core/SkTraceEvent.h" // for TRACE_STR_COPY - // PERFETTO_TRACK_EVENT_NAMESPACE must be defined before including Perfetto. This allows Skia to // maintain separate "track event" category storage, etc. from codebases linked into the same // executable, and avoid symbol duplication errors.