From 841f818387cab380b6b21158ad94c9b256bb9c32 Mon Sep 17 00:00:00 2001 From: mfomitchev Date: Fri, 6 Nov 2015 18:03:19 -0800 Subject: Aura on Android: content/browser Changes necessary to get content/browser, content/public/browser, and content/child GN targets to build. BUG=507792 Review URL: https://codereview.chromium.org/1411503005 Cr-Commit-Position: refs/heads/master@{#358496} --- components/tracing/trace_config_file.cc | 2 +- components/tracing/trace_config_file.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'components/tracing') diff --git a/components/tracing/trace_config_file.cc b/components/tracing/trace_config_file.cc index 95e3924..f1df192 100644 --- a/components/tracing/trace_config_file.cc +++ b/components/tracing/trace_config_file.cc @@ -130,7 +130,7 @@ int TraceConfigFile::GetStartupDuration() const { return startup_duration_; } -#if !defined(OS_ANDROID) +#if !defined(OS_ANDROID) || defined(USE_AURA) base::FilePath TraceConfigFile::GetResultFile() const { DCHECK(IsEnabled()); return result_file_; diff --git a/components/tracing/trace_config_file.h b/components/tracing/trace_config_file.h index 863fee4..0834fc2 100644 --- a/components/tracing/trace_config_file.h +++ b/components/tracing/trace_config_file.h @@ -70,7 +70,7 @@ class TRACING_EXPORT TraceConfigFile { bool IsEnabled() const; base::trace_event::TraceConfig GetTraceConfig() const; int GetStartupDuration() const; -#if !defined(OS_ANDROID) +#if !defined(OS_ANDROID) || defined(USE_AURA) base::FilePath GetResultFile() const; #endif -- cgit v1.1