diff options
| author | 2017-01-18 15:39:44 -0800 | |
|---|---|---|
| committer | 2017-01-18 15:39:44 -0800 | |
| commit | 27cdfc3e9d7c71bd95639eb315fac2c36494e14e (patch) | |
| tree | a9113a9eb15b4918daebec6b4e0f7c7d622c2eee | |
| parent | 354b20fe5843444aad9e54ff60d9b73de24fb1e9 (diff) | |
| parent | f79a82d6a25a64430c5e72b06016190ab07a5f48 (diff) | |
resolve merge conflicts of f79a82d6a to nyc-mr1-dev-plus-aosp
Change-Id: I5a9fbde2637d746bfd32d5b7546777708746e6d9
| -rw-r--r-- | cmds/dumpstate/Android.mk | 2 | ||||
| -rw-r--r-- | cmds/dumpstate/utils.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cmds/dumpstate/Android.mk b/cmds/dumpstate/Android.mk index 0433f31eb2..a3522596c0 100644 --- a/cmds/dumpstate/Android.mk +++ b/cmds/dumpstate/Android.mk @@ -10,7 +10,7 @@ LOCAL_SRC_FILES := dumpstate.cpp utils.cpp LOCAL_MODULE := dumpstate -LOCAL_SHARED_LIBRARIES := libcutils liblog libselinux libbase +LOCAL_SHARED_LIBRARIES := libcutils libdebuggerd_client liblog libselinux libbase # ZipArchive support, the order matters here to get all symbols. LOCAL_STATIC_LIBRARIES := libziparchive libz libcrypto_static LOCAL_HAL_STATIC_LIBRARIES := libdumpstate diff --git a/cmds/dumpstate/utils.cpp b/cmds/dumpstate/utils.cpp index f04887c1bc..d3ee93bf7e 100644 --- a/cmds/dumpstate/utils.cpp +++ b/cmds/dumpstate/utils.cpp @@ -40,9 +40,9 @@ #include <vector> #include <android-base/file.h> -#include <cutils/debugger.h> #include <cutils/properties.h> #include <cutils/sockets.h> +#include <debuggerd/client.h> #include <log/log.h> #include <private/android_filesystem_config.h> |