am 13783d99: Merge "x86: Fix DT_TEXTREL in assembly code"
* commit '13783d992d2da1ed649392b9a65370bfb94da2bf':
x86: Fix DT_TEXTREL in assembly code
diff --git a/Crypto.mk b/Crypto.mk
index 6f94f76..5a48c47 100644
--- a/Crypto.mk
+++ b/Crypto.mk
@@ -570,7 +570,6 @@
LOCAL_SHARED_LIBRARIES := $(log_shared_libraries)
ifeq ($(TARGET_ARCH),arm)
-LOCAL_NDK_VERSION := 5
LOCAL_SDK_VERSION := 9
endif
@@ -607,7 +606,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/README.android b/README.android
index e93fb00..3583301 100644
--- a/README.android
+++ b/README.android
@@ -23,7 +23,6 @@
2) Update the variables in openssl.config and openssl.version as appropriate.
At the very least you will need to update the openssl.version.
- Similarly update ThirdPartyProject.prop.
3) Run:
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/
diff --git a/openssl.version b/openssl.version
index 126c023..1616021 100644
--- a/openssl.version
+++ b/openssl.version
@@ -1,2 +1 @@
-# also update ThirdPartyProject.prop
OPENSSL_VERSION=1.0.1c
