diff options
| author | Colin Cross <ccross@android.com> | 2018-10-10 14:20:31 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2019-09-06 13:59:47 -0700 |
| commit | 94596c3853f4cda13048efbf8dc3873fc158be34 (patch) | |
| tree | 2fac4ad1b708d03655474994f7af35e3985ce395 /src | |
| parent | f3c1b635c0a243d8f6db264ee30c290b617e48c4 (diff) | |
| download | protobuf-94596c3853f4cda13048efbf8dc3873fc158be34.tar.gz | |
Revert "Wrap liblog dependency in GOOGLE_PROTOBUF_MIN_LOG_LEVEL"
This reverts commit 08ddffbd976f97a994d70d909f933dff95569e6f.
Logging methods are now used even if GOOGLE_PROTOBUF_MIN_LOG_LEVEL
is not set.
Bug: 37342627
Bug: 117607748
Test: m checkbuild
Change-Id: Id5e390bd2129037b76c11b2f740e7702062ef4c4
Merged-In: Id5e390bd2129037b76c11b2f740e7702062ef4c4
Diffstat (limited to 'src')
| -rw-r--r-- | src/google/protobuf/stubs/common.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/google/protobuf/stubs/common.cc b/src/google/protobuf/stubs/common.cc index 5308eefd9..6687f18aa 100644 --- a/src/google/protobuf/stubs/common.cc +++ b/src/google/protobuf/stubs/common.cc @@ -50,10 +50,8 @@ #error "No suitable threading library available." #endif #if defined(__ANDROID__) -#ifdef GOOGLE_PROTOBUF_MIN_LOG_LEVEL #include <android/log.h> #endif -#endif #include <google/protobuf/stubs/callback.h> #include <google/protobuf/stubs/logging.h> |