am 13e2fdfa: am b73232f0: Merge "Disable x86 assembly on darwin"
* commit '13e2fdfa8c689a3f6e3fc5d2c8c3cea9c85c0387':
Disable x86 assembly on darwin
diff --git a/Crypto.mk b/Crypto.mk
index cb1fbaf..388e30e 100644
--- a/Crypto.mk
+++ b/Crypto.mk
@@ -572,7 +572,6 @@
LOCAL_SHARED_LIBRARIES := $(log_shared_libraries)
ifeq ($(TARGET_ARCH),arm)
-LOCAL_NDK_VERSION := 5
LOCAL_SDK_VERSION := 9
endif
@@ -610,7 +609,6 @@
LOCAL_SHARED_LIBRARIES := $(log_shared_libraries)
ifeq ($(TARGET_ARCH),arm)
-LOCAL_NDK_VERSION := 5
LOCAL_SDK_VERSION := 9
# Use the NDK prebuilt libdl.
LOCAL_LDFLAGS += -ldl
diff --git a/Ssl.mk b/Ssl.mk
index e0bb716..667bc74 100644
--- a/Ssl.mk
+++ b/Ssl.mk
@@ -58,7 +58,6 @@
include $(LOCAL_PATH)/android-config.mk
ifeq ($(TARGET_ARCH),arm)
-LOCAL_NDK_VERSION := 5
LOCAL_SDK_VERSION := 9
endif
LOCAL_SRC_FILES += $(local_src_files)
@@ -75,7 +74,6 @@
include $(LOCAL_PATH)/android-config.mk
ifeq ($(TARGET_ARCH),arm)
-LOCAL_NDK_VERSION := 5
LOCAL_SDK_VERSION := 9
endif
LOCAL_SRC_FILES += $(local_src_files)
diff --git a/ThirdPartyProject.prop b/ThirdPartyProject.prop
deleted file mode 100644
index efc713e..0000000
--- a/ThirdPartyProject.prop
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2010 Google Inc. All Rights Reserved.
-#Fri Jul 16 10:03:09 PDT 2010
-currentVersion=1.0.1c
-version=1.0.1c
-isNative=true
-feedurl=http\://www.openssl.org/
-name=openssl
-keywords=openssl
-onDevice=true
-homepage=http\://www.openssl.org/
