Commit 38039d87 authored May 09, 2017 by Alex Klyubin Committed by android-build-merger May 09, 2017

Merge "Merge "Merge "Switch from libcrypto_static to libcrypto target" am:...

Merge "Merge "Merge "Switch from libcrypto_static to libcrypto target" am: 4ad52565 am: 44eb369c" into nyc-mr2-dev-plus-aosp am: 473e6741" into oc-dev-plus-aosp
am: 9e79409e

Change-Id: Ie678a26b02ce7b50130dbc003ef5e30528a4b3c6

parents d0d08382 9e79409e

tools/obbtool/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@ LOCAL_MODULE_TAGS := optional
		LOCAL_CFLAGS := -Wall -Werror -Wno-mismatched-tags
		LOCAL_SRC_FILES := pbkdf2gen.cpp
		LOCAL_LDLIBS += -ldl
		LOCAL_STATIC_LIBRARIES := libcrypto_static
		LOCAL_STATIC_LIBRARIES := libcrypto

		include $(BUILD_HOST_EXECUTABLE)