From 07f07a86937b16fe653fd34d77320dea1716827d Mon Sep 17 00:00:00 2001 From: Adam Langley Date: Fri, 13 Feb 2015 14:47:24 -0800 Subject: Specify a local SDK version. Without this the conscrypt build fails in `make checkbuild` because GCC emits calls to __memset_chk and friends, but the NDK doesn't provide them. Change-Id: I37d783f0e0e7d53a671fc03056e6450a4f5d1c95 --- Android.mk | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index 81b6ce1..fcb569a 100644 --- a/Android.mk +++ b/Android.mk @@ -12,6 +12,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libcrypto_static LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/src/include LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/crypto-sources.mk +LOCAL_SDK_VERSION := 9 include $(LOCAL_PATH)/crypto-sources.mk include $(BUILD_STATIC_LIBRARY) @@ -22,6 +23,7 @@ LOCAL_MODULE := libcrypto LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/src/include LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/crypto-sources.mk LOCAL_CFLAGS += -fvisibility=hidden -DBORINGSSL_SHARED_LIBRARY -DBORINGSSL_IMPLEMENTATION +LOCAL_SDK_VERSION := 9 include $(LOCAL_PATH)/crypto-sources.mk include $(BUILD_SHARED_LIBRARY) @@ -66,6 +68,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libssl_static LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/src/include LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/ssl-sources.mk +LOCAL_SDK_VERSION := 9 include $(LOCAL_PATH)/ssl-sources.mk include $(BUILD_STATIC_LIBRARY) @@ -77,6 +80,7 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/src/include LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/ssl-sources.mk LOCAL_CFLAGS += -fvisibility=hidden -DBORINGSSL_SHARED_LIBRARY -DBORINGSSL_IMPLEMENTATION LOCAL_SHARED_LIBRARIES=libcrypto +LOCAL_SDK_VERSION := 9 include $(LOCAL_PATH)/ssl-sources.mk include $(BUILD_SHARED_LIBRARY) -- cgit v1.1