| commit | 5ba8681115ef922cb944d6fd804d782486a699a1 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Sep 06 15:52:57 2017 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Sep 06 15:52:57 2017 +0000 |
| tree | 5224e3efe0d9e75e36b70f47ec12ddf512c96675 | |
| parent | a518d2ff2dd91bb87a17d6fda7235a30b6fb064c [diff] | |
| parent | 72301b73b4463b32b69e43af0cc2dde9ac89fb97 [diff] |
Merge "Wrap liblog dependency in GOOGLE_PROTOBUF_MIN_LOG_LEVEL"
diff --git a/src/google/protobuf/stubs/common.cc b/src/google/protobuf/stubs/common.cc index d443e8a..3a33b55 100644 --- a/src/google/protobuf/stubs/common.cc +++ b/src/google/protobuf/stubs/common.cc
@@ -53,8 +53,10 @@ #error "No suitable threading library available." #endif #if defined(__ANDROID__) +#ifdef GOOGLE_PROTOBUF_MIN_LOG_LEVEL #include <android/log.h> #endif +#endif namespace google { namespace protobuf {