From owner-svn-ports-all@freebsd.org Sun Jul 2 23:05:40 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D273D9B147A; Sun, 2 Jul 2017 23:05:40 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9E9F079BA2; Sun, 2 Jul 2017 23:05:40 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v62N5dh1055903; Sun, 2 Jul 2017 23:05:39 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v62N5dNi055901; Sun, 2 Jul 2017 23:05:39 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201707022305.v62N5dNi055901@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sun, 2 Jul 2017 23:05:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r444905 - branches/2017Q3/devel/android-tools-adb-devel/files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2017Q3/devel/android-tools-adb-devel/files X-SVN-Commit-Revision: 444905 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Jul 2017 23:05:40 -0000 Author: jbeich Date: Sun Jul 2 23:05:39 2017 New Revision: 444905 URL: https://svnweb.freebsd.org/changeset/ports/444905 Log: MFH: r444904 devel/android-tools-adb-devel: oops, don't turn off assert() in logging_test.cpp Approved by: ports-secteam blanket Added: branches/2017Q3/devel/android-tools-adb-devel/files/patch-base_include_android-base_logging.h - copied unchanged from r444904, head/devel/android-tools-adb-devel/files/patch-base_include_android-base_logging.h Modified: branches/2017Q3/devel/android-tools-adb-devel/files/Makefile Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/devel/android-tools-adb-devel/files/Makefile ============================================================================== --- branches/2017Q3/devel/android-tools-adb-devel/files/Makefile Sun Jul 2 23:03:52 2017 (r444904) +++ branches/2017Q3/devel/android-tools-adb-devel/files/Makefile Sun Jul 2 23:05:39 2017 (r444905) @@ -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 Copied: branches/2017Q3/devel/android-tools-adb-devel/files/patch-base_include_android-base_logging.h (from r444904, 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) +++ branches/2017Q3/devel/android-tools-adb-devel/files/patch-base_include_android-base_logging.h Sun Jul 2 23:05:39 2017 (r444905, copy of r444904, head/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;