commit 062926ec7ccbd8cf4d49c98de742cdf3c338e275
author Felipe Leme <felipeal@google.com> Thu Oct 27 15:51:12 2016 -0700
committer Felipe Leme <felipeal@google.com> Fri Oct 28 18:11:19 2016 -0700
tree 0d85aa4a56105562bc750f25c9ae5ec36554fba6
parent 61ac11013a08510d2c01199125d3bcc38715de91

Uses DISALLOW_COPY_AND_ASSIGN.

BUG: 26379932
Test: DumpstateTest passes

Change-Id: I544929fdd1f9777d6e2e6c602ca75d00fee358b9

cmds/dumpstate/dumpstate.h

diff --git a/cmds/dumpstate/dumpstate.h b/cmds/dumpstate/dumpstate.h
index ab36c41c..19f46e2 100644
--- a/cmds/dumpstate/dumpstate.h
+++ b/cmds/dumpstate/dumpstate.h
@@ -17,6 +17,8 @@
 #ifndef FRAMEWORK_NATIVE_CMD_DUMPSTATE_H_
 #define FRAMEWORK_NATIVE_CMD_DUMPSTATE_H_
 
+#include <android-base/macros.h>
+
 #ifndef MYLOGD
 #define MYLOGD(...) fprintf(stderr, __VA_ARGS__); ALOGD(__VA_ARGS__);
 #endif
@@ -92,6 +94,8 @@
     std::string title_;
     FILE* out_;
     uint64_t started_;
+
+    DISALLOW_COPY_AND_ASSIGN(DurationReporter);
 };
 
 /*
@@ -396,6 +400,8 @@
 
     // Build type (such as 'user' or 'eng').
     std::string build_type_;
+
+    DISALLOW_COPY_AND_ASSIGN(Dumpstate);
 };
 
 // for_each_pid_func = void (*)(int, const char*);

cmds/dumpstate/libdumpstate_default.cpp

diff --git a/cmds/dumpstate/libdumpstate_default.cpp b/cmds/dumpstate/libdumpstate_default.cpp
index fd840df..a5418ea 100644
--- a/cmds/dumpstate/libdumpstate_default.cpp
+++ b/cmds/dumpstate/libdumpstate_default.cpp
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-#include "dumpstate.h"
-
 void dumpstate_board(void)
 {
 }