diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2017-07-02 23:05:39 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2017-07-02 23:05:39 +0000 |
| commit | 1b3fcd839001ade1788f938e7fcacf14486d6535 (patch) | |
| tree | 36a3acd174800c71b55a69385c79cac6efbd2ec1 | |
| parent | 0253697d0005008ea5eeeb3f271f2b2cb140b7b8 (diff) | |
| download | ports-1b3fcd839001ade1788f938e7fcacf14486d6535.tar.gz ports-1b3fcd839001ade1788f938e7fcacf14486d6535.zip | |
MFH: r444904
devel/android-tools-adb-devel: oops, don't turn off assert() in logging_test.cpp
Approved by: ports-secteam blanket
Notes
Notes:
svn path=/branches/2017Q3/; revision=444905
| -rw-r--r-- | devel/android-tools-adb-devel/files/Makefile | 1 | ||||
| -rw-r--r-- | devel/android-tools-adb-devel/files/patch-base_include_android-base_logging.h | 11 |
2 files changed, 11 insertions, 1 deletions
diff --git a/devel/android-tools-adb-devel/files/Makefile b/devel/android-tools-adb-devel/files/Makefile index 66368c5ea612..d9d149f8ac3f 100644 --- a/devel/android-tools-adb-devel/files/Makefile +++ b/devel/android-tools-adb-devel/files/Makefile @@ -68,7 +68,6 @@ TEST_SRCS+= stringprintf_test.cpp TEST_SRCS+= strings_test.cpp TEST_SRCS+= test_main.cpp TEST_SRCS+= test_utils.cpp -CPPFLAGS.logging_test.cpp+= -DNDEBUG # XXX DCHECK vs. timestamps .PATH: ${.CURDIR}/../libcrypto_utils SRCS+= android_pubkey.c diff --git a/devel/android-tools-adb-devel/files/patch-base_include_android-base_logging.h b/devel/android-tools-adb-devel/files/patch-base_include_android-base_logging.h new file mode 100644 index 000000000000..3fc6644c9a6f --- /dev/null +++ b/devel/android-tools-adb-devel/files/patch-base_include_android-base_logging.h @@ -0,0 +1,11 @@ +--- base/include/android-base/logging.h.orig 2017-07-02 22:55:50 UTC ++++ base/include/android-base/logging.h +@@ -321,7 +321,7 @@ struct LogAbortAfterFullExpr { + // DCHECKs are debug variants of CHECKs only enabled in debug builds. Generally + // CHECK should be used unless profiling identifies a CHECK as being in + // performance critical code. +-#if defined(NDEBUG) && !defined(__clang_analyzer__) ++#if defined(NDEBUG) && !defined(__clang_analyzer__) || !defined(__ANDROID__) + static constexpr bool kEnableDChecks = false; + #else + static constexpr bool kEnableDChecks = true; |