aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2017-06-13 07:28:09 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2017-06-13 07:28:09 +0000
commit4bcafdad9f4456ee43a3e9a03aae2bd9d110c74a (patch)
treeeb691fb977abe787aa7b1049aa0b18715126ce1a
parent66378961dddcc0c38e10e2635ac5c42bc4b31955 (diff)
parentd29ccdec2b2e08f745668bb6eb9abb367782a6be (diff)
downloadprotobuf-4bcafdad9f4456ee43a3e9a03aae2bd9d110c74a.tar.gz
release-request-998756e3-f9eb-4510-98be-1a27f60bee38-for-git_oc-mr1-release-4094614 snap-temp-L07300000073564509
Change-Id: Ifd81328e3d5d37b770291374c1b5c6ed99adfcf9
-rw-r--r--src/google/protobuf/stubs/common.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/google/protobuf/stubs/common.cc b/src/google/protobuf/stubs/common.cc
index d443e8ae9..3a33b55de 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 {