commit 261a733906981fc2390f0803effdc55c51842a5c
author Mark Salyzyn <salyzyn@google.com> Tue May 24 12:38:40 2016 -0700
committer Mark Salyzyn <salyzyn@google.com> Tue May 24 12:38:40 2016 -0700
tree e61d0b450866c8a019f92314afe1938c931350b5
parent c51e7ff96d97cdcdd420f54df2c3171c1016b14b
parent 175008167a78ca283a20a2e4a0887579fc579dc9

resolve merge conflicts of 1750081 to nyc-dev-plus-aosp

Change-Id: If25f336cfc2fa02cba863987da6f55647636417e

cmds/dumpstate/Android.mk

diff --git a/cmds/dumpstate/Android.mk b/cmds/dumpstate/Android.mk
index c798dde..2dc8787 100644
--- a/cmds/dumpstate/Android.mk
+++ b/cmds/dumpstate/Android.mk
@@ -14,9 +14,9 @@
 
 LOCAL_MODULE := dumpstate
 
-LOCAL_SHARED_LIBRARIES := libcutils liblog libselinux
+LOCAL_SHARED_LIBRARIES := libcutils liblog libselinux libbase
 # ZipArchive support, the order matters here to get all symbols.
-LOCAL_STATIC_LIBRARIES := libziparchive libz libbase libcrypto_static
+LOCAL_STATIC_LIBRARIES := libziparchive libz libcrypto_static
 LOCAL_HAL_STATIC_LIBRARIES := libdumpstate
 LOCAL_CFLAGS += -Wall -Werror -Wno-unused-parameter
 LOCAL_INIT_RC := dumpstate.rc