nfc: Remove defined(MACRO) and define undefined macros

Test: compiles
Change-Id: I5ea9a8f38cfc41e8a71eeb1c11f96755474b4121
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
diff --git a/src/include/gki_target.h b/src/include/gki_target.h
index 86211ea..b7923ba 100644
--- a/src/include/gki_target.h
+++ b/src/include/gki_target.h
@@ -381,7 +381,7 @@
 #define GKI_BUF8_MAX                30
 #endif
 
-#if defined(GKI_DEBUG) && (GKI_DEBUG == TRUE)
+#if (GKI_DEBUG == TRUE)
 #ifdef LOG_TAG
 #undef LOG_TAG
 #endif
diff --git a/src/include/nfc_target.h b/src/include/nfc_target.h
index 9d41e25..0cd444f 100644
--- a/src/include/nfc_target.h
+++ b/src/include/nfc_target.h
@@ -33,6 +33,9 @@
 #include "bt_trace.h"
 #endif
 
+#ifndef USERIAL_DEBUG
+#define USERIAL_DEBUG                       FALSE
+#endif
 
 /* API macros for DLL (needed to export API functions from DLLs) */
 #define NFC_API         EXPORT_API