aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2018-03-17 09:31:26 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2018-03-17 09:31:26 +0000
commit2f246dafc5417ede6e9dcfdb6cc508f238c86d31 (patch)
tree3066a082bce8f80ec17056527eff33aa2ed2d23c
parent574ae790bb8c420e66184e42f7646ad6a22aa6a2 (diff)
parent936c2f48afea115252d4f4cee6fd0d48bc54d40a (diff)
downloadperf_data_converter-2f246dafc5417ede6e9dcfdb6cc508f238c86d31.tar.gz
Snap for 4661748 from 936c2f48afea115252d4f4cee6fd0d48bc54d40a to qt-release
Change-Id: I21a43392028811b284f76089ac342e73dacda23f
-rw-r--r--src/quipper/Android.bp4
-rw-r--r--src/quipper/androidbase/base/logging.h4
-rw-r--r--src/quipper/perf_parser.cc2
3 files changed, 7 insertions, 3 deletions
diff --git a/src/quipper/Android.bp b/src/quipper/Android.bp
index fa78b46..276512a 100644
--- a/src/quipper/Android.bp
+++ b/src/quipper/Android.bp
@@ -138,6 +138,9 @@ cc_defaults {
darwin: {
enabled: false,
},
+ windows: {
+ enabled: false,
+ }
},
}
@@ -227,6 +230,7 @@ cc_test {
"libz", // For libelf.
],
shared_libs: [
+ "libbase",
"libprotobuf-cpp-full",
],
diff --git a/src/quipper/androidbase/base/logging.h b/src/quipper/androidbase/base/logging.h
index f19babc..3a86d35 100644
--- a/src/quipper/androidbase/base/logging.h
+++ b/src/quipper/androidbase/base/logging.h
@@ -24,7 +24,7 @@ extern bool gVlogEnabled;
#define VLOG(level) ::logging::gVlogEnabled && LOG(INFO)
-#define DLOG(x) LOG(x)
-#define DVLOG(x) VLOG(x)
+#define DLOG(x) android::base::kEnableDChecks && LOG(x)
+#define DVLOG(x) android::base::kEnableDChecks && VLOG(x)
#endif // CHROMIUMOS_WIDE_PROFILING_MYBASE_BASE_LOGGING_H_
diff --git a/src/quipper/perf_parser.cc b/src/quipper/perf_parser.cc
index 682d53b..febea2c 100644
--- a/src/quipper/perf_parser.cc
+++ b/src/quipper/perf_parser.cc
@@ -253,7 +253,7 @@ bool PerfParser::ProcessEvents() {
// Print stats collected from parsing.
// clang-format off
- LOG(INFO) << "Parser processed: "
+ VLOG(1) << "Parser processed: "
<< stats_.num_mmap_events << " MMAP/MMAP2 events, "
<< stats_.num_comm_events << " COMM events, "
<< stats_.num_fork_events << " FORK events, "