Use NDK libraries for x86 and MIPS build.
Bug: 6953633
Change-Id: I745588fb024040a42a1fcb3222db7e104d2114fe
diff --git a/Crypto.mk b/Crypto.mk
index 5a48c47..d66c82f 100644
--- a/Crypto.mk
+++ b/Crypto.mk
@@ -569,9 +569,7 @@
LOCAL_SHARED_LIBRARIES := $(log_shared_libraries)
-ifeq ($(TARGET_ARCH),arm)
LOCAL_SDK_VERSION := 9
-endif
LOCAL_SRC_FILES += $(local_src_files)
LOCAL_CFLAGS += $(local_c_flags)
@@ -605,13 +603,8 @@
LOCAL_SHARED_LIBRARIES := $(log_shared_libraries)
-ifeq ($(TARGET_ARCH),arm)
LOCAL_SDK_VERSION := 9
-# Use the NDK prebuilt libdl.
LOCAL_LDFLAGS += -ldl
-else
-LOCAL_SHARED_LIBRARIES += libdl
-endif
LOCAL_SRC_FILES += $(local_src_files)
LOCAL_CFLAGS += $(local_c_flags)
diff --git a/Ssl.mk b/Ssl.mk
index 667bc74..6062a61 100644
--- a/Ssl.mk
+++ b/Ssl.mk
@@ -57,9 +57,8 @@
include $(CLEAR_VARS)
include $(LOCAL_PATH)/android-config.mk
-ifeq ($(TARGET_ARCH),arm)
LOCAL_SDK_VERSION := 9
-endif
+
LOCAL_SRC_FILES += $(local_src_files)
LOCAL_C_INCLUDES += $(local_c_includes)
LOCAL_SHARED_LIBRARIES = $(log_shared_libraries)
@@ -73,9 +72,8 @@
include $(CLEAR_VARS)
include $(LOCAL_PATH)/android-config.mk
-ifeq ($(TARGET_ARCH),arm)
LOCAL_SDK_VERSION := 9
-endif
+
LOCAL_SRC_FILES += $(local_src_files)
LOCAL_C_INCLUDES += $(local_c_includes)
LOCAL_SHARED_LIBRARIES += libcrypto $(log_shared_libraries)
