diff options
| author | Calvin On <con@google.com> | 2016-06-14 18:28:36 +0000 |
|---|---|---|
| committer | Calvin On <con@google.com> | 2016-06-14 18:28:36 +0000 |
| commit | 7047254fb82d8d3d56c0dcd712c36b89d9c45f5d (patch) | |
| tree | 2535022c0bb6d905133bcbca4ad449677b93969c | |
| parent | 721a8834a7f1a7f5303fae9164878b2f3ab51c9f (diff) | |
| download | shamu-7047254fb82d8d3d56c0dcd712c36b89d9c45f5d.tar.gz | |
Revert "Dump Wearable/Google info for Shamu."
This reverts commit 721a8834a7f1a7f5303fae9164878b2f3ab51c9f.
Change-Id: I5403dd2e925e8558d681bc5811605afac2870f9a
| -rw-r--r-- | dumpstate/Android.mk | 8 | ||||
| -rw-r--r-- | dumpstate/dumpstate.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/dumpstate/Android.mk b/dumpstate/Android.mk index faecf44c..20004937 100644 --- a/dumpstate/Android.mk +++ b/dumpstate/Android.mk @@ -14,9 +14,13 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_C_INCLUDES := frameworks/native/cmds/dumpstate vendor/google/libraries/dumpstate + +LOCAL_C_INCLUDES := frameworks/native/cmds/dumpstate + LOCAL_SRC_FILES := dumpstate.cpp + LOCAL_MODULE := libdumpstate.shamu -LOCAL_WHOLE_STATIC_LIBRARIES := libdumpstate.google + LOCAL_MODULE_TAGS := optional + include $(BUILD_STATIC_LIBRARY) diff --git a/dumpstate/dumpstate.cpp b/dumpstate/dumpstate.cpp index 6f8931dd..8dfb3d06 100644 --- a/dumpstate/dumpstate.cpp +++ b/dumpstate/dumpstate.cpp @@ -15,7 +15,6 @@ */ #include <dumpstate.h> -#include <dumpstate_google.h> void dumpstate_board() { @@ -45,7 +44,4 @@ void dumpstate_board() run_command("Subsystem Tombstone list", 5, SU_PATH, "root", "ls", "-l", "/data/tombstones/ramdump", NULL); run_command("ION CLIENTS", 5, SU_PATH, "root", "/system/bin/sh", "-c", "for f in $(ls /d/ion/clients/*); do echo $f; cat $f; done", NULL); run_command("ION HEAPS", 5, SU_PATH, "root", "/system/bin/sh", "-c", "for f in $(ls /d/ion/heaps/*); do echo $f; cat $f; done", NULL); - - // Dump Google-specific info. - dumpstate_google(); }; |