Merge "Patch deletion due to upstream fix"

patch/LF.BR.1.2.3/librecovery/Bug-1122162-librecovery_test-needs-liblog.patch

-From 815a82e4e78aacac9ad2a93c402df609f9a48103 Mon Sep 17 00:00:00 2001
-From: Diego Wilson <dwilson@codeaurora.org>
-Date: Thu, 15 Jan 2015 11:04:27 -0800
-Subject: [PATCH] Bug 1122162 - librecovery_test needs liblog
-
-Change-Id: I5cc88e8a3bcb684576f5fd6e30600041d3c9ba07
----
- Android.mk | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/Android.mk b/Android.mk
-index 23d881a..ec1a02c 100644
---- a/Android.mk
-+++ b/Android.mk
-@@ -50,19 +50,18 @@ LOCAL_SRC_FILES := $(LIBRECOVERY_SRC_FILES)
- LOCAL_SHARED_LIBRARIES := libcutils
- LOCAL_CFLAGS := $(LIBRECOVERY_CFLAGS)
- LOCAL_MODULE_TAGS := optional eng
- include $(BUILD_SHARED_LIBRARY)
- 
- # librecovery test harness
- include $(CLEAR_VARS)
- LOCAL_MODULE := librecovery_test
--LOCAL_FORCE_STATIC_EXECUTABLE := true
- LOCAL_SRC_FILES := librecovery_test.c $(LIBRECOVERY_SRC_FILES)
--LOCAL_STATIC_LIBRARIES := libcutils libc
-+LOCAL_SHARED_LIBRARIES := libcutils libc liblog
- LOCAL_CFLAGS := $(LIBRECOVERY_CFLAGS)
- LOCAL_MODULE_TAGS := tests
- include $(BUILD_EXECUTABLE)
- 
- # librecovery test data -- this uses a local make target instead of an AOSP
- # module to avoid being built by default (signing an update zip requires java)
- TESTS_DIR := $(LOCAL_PATH)/tests
- OUT_DIR := $(shell cd $(call local-intermediates-dir); pwd)
--- 
-2.1.2
-