diff options
| author | Yifan Hong <elsk@google.com> | 2017-06-09 16:35:16 -0700 |
|---|---|---|
| committer | Yifan Hong <elsk@google.com> | 2017-06-09 16:40:55 -0700 |
| commit | 08ddffbd976f97a994d70d909f933dff95569e6f (patch) | |
| tree | eb691fb977abe787aa7b1049aa0b18715126ce1a | |
| parent | 1ee0c0718b5cfeea7b5bf035c0c5405bbdb9fb88 (diff) | |
| download | protobuf-08ddffbd976f97a994d70d909f933dff95569e6f.tar.gz | |
Wrap liblog dependency in GOOGLE_PROTOBUF_MIN_LOG_LEVELoreo-dr1-dev
__android_log_write is only used when GOOGLE_PROTOBUF_MIN_LOG_LEVEL
is defined. There is no dependency to android/log.h if
GOOGLE_PROTOBUF_MIN_LOG_LEVEL is not defined.
Test: mma -j
Test: m -j
Test: BOARD_VNDK_VERSION=current mma -j
Test: BOARD_VNDK_VERSION=current m -j
Bug: 37342627
Change-Id: I7ef73972ea925d0a29c1f84ac880ca834b3989db
| -rw-r--r-- | src/google/protobuf/stubs/common.cc | 2 |
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 { |