From: Josh Gao <jmgao@google.com>
Date: Wed, 18 Jan 2017 23:39:44 +0000 (-0800)
Subject: resolve merge conflicts of f79a82d6a to nyc-mr1-dev-plus-aosp
X-Git-Tag: android-x86-8.1-r1~377^2~44^2~28
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=27cdfc3e9d;p=android-x86%2Fframeworks-native.git

resolve merge conflicts of f79a82d6a to nyc-mr1-dev-plus-aosp

Change-Id: I5a9fbde2637d746bfd32d5b7546777708746e6d9
---

27cdfc3e9d7c71bd95639eb315fac2c36494e14e
diff --cc cmds/dumpstate/Android.mk
index 0433f31eb2,daeebc41e6..a3522596c0
--- a/cmds/dumpstate/Android.mk
+++ b/cmds/dumpstate/Android.mk
@@@ -10,7 -10,7 +10,7 @@@ LOCAL_SRC_FILES := dumpstate.cpp utils.
  
  LOCAL_MODULE := dumpstate
  
- LOCAL_SHARED_LIBRARIES := libcutils liblog libselinux libbase
 -LOCAL_SHARED_LIBRARIES := libcutils libdebuggerd_client liblog libselinux libbase libhardware_legacy
++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