svn commit: r444905 - branches/2017Q3/devel/android-tools-adb-devel/files

[Jan Beich]

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;