Date: Sun, 2 Jul 2017 23:03:53 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r444904 - head/devel/android-tools-adb-devel/files Message-ID: <201707022303.v62N3ruP055670@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Sun Jul 2 23:03:52 2017 New Revision: 444904 URL: https://svnweb.freebsd.org/changeset/ports/444904 Log: devel/android-tools-adb-devel: oops, don't turn off assert() in logging_test.cpp Added: head/devel/android-tools-adb-devel/files/patch-base_include_android-base_logging.h (contents, props changed) Modified: head/devel/android-tools-adb-devel/files/Makefile (contents, props changed) Modified: head/devel/android-tools-adb-devel/files/Makefile ============================================================================== --- head/devel/android-tools-adb-devel/files/Makefile Sun Jul 2 22:32:09 2017 (r444903) +++ head/devel/android-tools-adb-devel/files/Makefile Sun Jul 2 23:03:52 2017 (r444904) @@ -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 Added: head/devel/android-tools-adb-devel/files/patch-base_include_android-base_logging.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/android-tools-adb-devel/files/patch-base_include_android-base_logging.h Sun Jul 2 23:03:52 2017 (r444904) @@ -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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707022303.v62N3ruP055670>