From cda1d7895fef9044b4ed7249719c0cb897546f50 Mon Sep 17 00:00:00 2001
From: Rahul Frias <rfrias@google.com>
Date: Wed, 30 Sep 2015 11:18:20 -0700
Subject: [PATCH] Stop Parsing the Command Line in InitLogging

* Add dummy comments to blank files

  git5 patch does not seem to handle blank files well.  This CL will
  allow the new CDM interface to be tested on iOS before it is
  officially merged in google3.

* Stop Parsing the Command Line in InitLogging

  [ Merge of http://go/wvgerrit/14164 ]

  This change removes the parameters from InitLogging() and removes the
  code in the Linux implementation that was using them.

Change-Id: I65849a89a2fac10cfc86eb16165bfcad468140aa
---
 libwvdrmengine/cdm/core/include/log.h                  | 2 +-
 libwvdrmengine/cdm/src/log.cpp                         | 9 ++++++++-
 libwvdrmengine/third_party/stringencoders/src/config.h | 1 +
 3 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 libwvdrmengine/third_party/stringencoders/src/config.h

diff --git a/libwvdrmengine/cdm/core/include/log.h b/libwvdrmengine/cdm/core/include/log.h
index d7a0a593..d03ef873 100644
--- a/libwvdrmengine/cdm/core/include/log.h
+++ b/libwvdrmengine/cdm/core/include/log.h
@@ -23,7 +23,7 @@ extern LogPriority g_cutoff;
 // This function is supplied for cases where the system layer does not
 // initialize logging.  This is also needed to initialize logging in
 // unit tests.
-void InitLogging(int argc, const char* const* argv);
+void InitLogging();
 
 void Log(const char* file, int line, LogPriority level, const char* fmt, ...);
 
diff --git a/libwvdrmengine/cdm/src/log.cpp b/libwvdrmengine/cdm/src/log.cpp
index bc631d93..8c012036 100644
--- a/libwvdrmengine/cdm/src/log.cpp
+++ b/libwvdrmengine/cdm/src/log.cpp
@@ -22,11 +22,18 @@
 #include "log.h"
 #include <utils/Log.h>
 
+/*
+ * Uncomment the line below if you want to have the LOGV messages to print
+ * IMPORTANT : this will affect all of CDM
+ */
+
+// #define LOG_NDEBUG 0
+
 namespace wvcdm {
 
 LogPriority g_cutoff = LOG_VERBOSE;
 
-void InitLogging(int /* argc */, const char* const* /* argv */) {}
+void InitLogging() {}
 
 void Log(const char* /* file */, int /* line */, LogPriority level,
          const char* fmt, ...) {
diff --git a/libwvdrmengine/third_party/stringencoders/src/config.h b/libwvdrmengine/third_party/stringencoders/src/config.h
new file mode 100644
index 00000000..48630b0f
--- /dev/null
+++ b/libwvdrmengine/third_party/stringencoders/src/config.h
@@ -0,0 +1 @@
+// dummy