diff options
author | Calvin On <con@google.com> | 2016-06-09 17:41:03 -0700 |
---|---|---|
committer | Calvin On <con@google.com> | 2016-06-13 13:02:07 -0700 |
commit | 721a8834a7f1a7f5303fae9164878b2f3ab51c9f (patch) | |
tree | 3d0c19498e2068fad4c04dc69e1d556b2c7712f5 | |
parent | f095143bcdfff2481b568988c213ec9fa0a9d6b2 (diff) | |
download | shamu-721a8834a7f1a7f5303fae9164878b2f3ab51c9f.tar.gz |
Dump Wearable/Google info for Shamu.
Bug: 28640932
Bug: 29277444
Change-Id: I2f3545c17f2049fa05f901b431e01db47d4fa57f
-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 20004937..faecf44c 100644 --- a/dumpstate/Android.mk +++ b/dumpstate/Android.mk @@ -14,13 +14,9 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) - -LOCAL_C_INCLUDES := frameworks/native/cmds/dumpstate - +LOCAL_C_INCLUDES := frameworks/native/cmds/dumpstate vendor/google/libraries/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 8dfb3d06..6f8931dd 100644 --- a/dumpstate/dumpstate.cpp +++ b/dumpstate/dumpstate.cpp @@ -15,6 +15,7 @@ */ #include <dumpstate.h> +#include <dumpstate_google.h> void dumpstate_board() { @@ -44,4 +45,7 @@ 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(); }; |