Merge "Do not force verbose logs on for anything including ComposerCo…

…mmandBuffer.h" into main am: 6e5537e am: 7d7c2f3 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3222543 Change-Id: I687471e2a7ee1e34a725323a8f4a73b6715b0c4d Signed-off-by: Automerger Merge Worker <[email protected]>
StyxProject · Sep 17, 2024 · 636cba8 · 636cba8
2 parents 9f92f80 + 7d7c2f3
commit 636cba8
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/...oser/2.1/utils/command-buffer/include/composer-command-buffer/2.1/ComposerCommandBuffer.h b/...oser/2.1/utils/command-buffer/include/composer-command-buffer/2.1/ComposerCommandBuffer.h
@@ -21,8 +21,7 @@
 #warn "ComposerCommandBuffer.h included without LOG_TAG"
 #endif
 
-#undef LOG_NDEBUG
-#define LOG_NDEBUG 0
+//#define LOG_NDEBUG 0
 
 #include <algorithm>
 #include <limits>

diff --git a/...oser/2.2/utils/command-buffer/include/composer-command-buffer/2.2/ComposerCommandBuffer.h b/...oser/2.2/utils/command-buffer/include/composer-command-buffer/2.2/ComposerCommandBuffer.h
@@ -20,8 +20,7 @@
 #warn "ComposerCommandBuffer.h included without LOG_TAG"
 #endif
 
-#undef LOG_NDEBUG
-#define LOG_NDEBUG 0
+//#define LOG_NDEBUG 0
 
 #include <algorithm>
 #include <limits>

diff --git a/...oser/2.3/utils/command-buffer/include/composer-command-buffer/2.3/ComposerCommandBuffer.h b/...oser/2.3/utils/command-buffer/include/composer-command-buffer/2.3/ComposerCommandBuffer.h
@@ -20,8 +20,7 @@
 #warn "ComposerCommandBuffer.h included without LOG_TAG"
 #endif
 
-#undef LOG_NDEBUG
-#define LOG_NDEBUG 0
+//#define LOG_NDEBUG 0
 
 #include <android/hardware/graphics/composer/2.3/IComposer.h>
 #include <android/hardware/graphics/composer/2.3/IComposerClient.h>

diff --git a/...oser/2.4/utils/command-buffer/include/composer-command-buffer/2.4/ComposerCommandBuffer.h b/...oser/2.4/utils/command-buffer/include/composer-command-buffer/2.4/ComposerCommandBuffer.h
@@ -20,8 +20,7 @@
 #warn "ComposerCommandBuffer.h included without LOG_TAG"
 #endif
 
-#undef LOG_NDEBUG
-#define LOG_NDEBUG 0
+//#define LOG_NDEBUG 0
 
 #include <android/hardware/graphics/composer/2.4/IComposer.h>
 #include <android/hardware/graphics/composer/2.4/IComposerClient.h>