commit 48772e0fe92c75e02a5ea92a6fbfdd0203c910ae
author Kenny Root <kroot@google.com> Thu Jun 27 10:31:00 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Jun 27 10:31:00 2013 -0700
tree 2e997e18bcee6a74feb3b3bd77f686b256ef5063
parent a2d5639afebf26910ff6b35a9b3afde2666d9363
parent e2a878e9cd7db48fd9466e19e1fa207a8117319e

am e2a878e9: Merge "Revert "Revert "Split up main engine from methods"""

* commit 'e2a878e9cd7db48fd9466e19e1fa207a8117319e':
  Revert "Revert "Split up main engine from methods""

keystore/Android.mk

diff --git a/keystore/Android.mk b/keystore/Android.mk
index dd3a12d..f495f34 100644
--- a/keystore/Android.mk
+++ b/keystore/Android.mk
@@ -20,7 +20,7 @@
 LOCAL_CFLAGS := -Wall -Wextra -Werror
 LOCAL_SRC_FILES := keystore.cpp keyblob_utils.cpp
 LOCAL_C_INCLUDES := external/openssl/include
-LOCAL_SHARED_LIBRARIES := libcutils libcrypto libhardware libkeystore_binder libutils libbinder
+LOCAL_SHARED_LIBRARIES := libcutils libcrypto libhardware libkeystore_binder libutils liblog libbinder
 LOCAL_MODULE := keystore
 LOCAL_MODULE_TAGS := optional
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
@@ -30,7 +30,7 @@
 LOCAL_CFLAGS := -Wall -Wextra -Werror
 LOCAL_SRC_FILES := keystore_cli.cpp
 LOCAL_C_INCLUDES := external/openssl/include
-LOCAL_SHARED_LIBRARIES := libcutils libcrypto libkeystore_binder libutils libbinder
+LOCAL_SHARED_LIBRARIES := libcutils libcrypto libkeystore_binder libutils liblog libbinder
 LOCAL_MODULE := keystore_cli
 LOCAL_MODULE_TAGS := debug
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
@@ -40,7 +40,7 @@
 include $(CLEAR_VARS)
 LOCAL_CFLAGS := -Wall -Wextra -Werror
 LOCAL_SRC_FILES := IKeystoreService.cpp keystore_get.cpp keyblob_utils.cpp
-LOCAL_SHARED_LIBRARIES := libbinder libutils
+LOCAL_SHARED_LIBRARIES := libbinder libutils liblog
 LOCAL_MODULE := libkeystore_binder
 LOCAL_MODULE_TAGS := optional
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/include