diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-09-09 22:03:47 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2013-09-10 12:39:30 -0700 |
| commit | 36f1c15a1cb2e66b8852ea51f7a82c4ccc9ac886 (patch) | |
| tree | ba03cff024b0425aa724c783b5b056c30479d1f7 /NativeCode.mk | |
| parent | c1b838f63f073fa8b4348f87ed294586729d265d (diff) | |
| download | libcore-36f1c15a1cb2e66b8852ea51f7a82c4ccc9ac886.zip libcore-36f1c15a1cb2e66b8852ea51f7a82c4ccc9ac886.tar.gz libcore-36f1c15a1cb2e66b8852ea51f7a82c4ccc9ac886.tar.bz2 | |
Fixed interruption of blocked SSLSocket via Socket.close()
Bug: 10599593
(cherry picked from commit 3f17b9a79c4331504f32d34ce46adf7a78870f87)
Change-Id: I1bffa8189d64aa8ee0aa1ac414359aecb71934a5
Diffstat (limited to 'NativeCode.mk')
| -rw-r--r-- | NativeCode.mk | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/NativeCode.mk b/NativeCode.mk index 42319dc..1a47ee4 100644 --- a/NativeCode.mk +++ b/NativeCode.mk @@ -95,11 +95,10 @@ LOCAL_CFLAGS += $(core_cflags) LOCAL_CFLAGS += -DJNI_JARJAR_PREFIX="com/android/" LOCAL_CPPFLAGS += $(core_cppflags) LOCAL_SRC_FILES := \ - crypto/src/main/native/org_conscrypt_NativeCrypto.cpp \ - luni/src/main/native/AsynchronousSocketCloseMonitor.cpp + crypto/src/main/native/org_conscrypt_NativeCrypto.cpp LOCAL_C_INCLUDES += $(core_c_includes) \ libcore/luni/src/main/native -LOCAL_SHARED_LIBRARIES += $(core_shared_libraries) libcrypto libssl libnativehelper libz +LOCAL_SHARED_LIBRARIES += $(core_shared_libraries) libcrypto libssl libnativehelper libz libjavacore LOCAL_STATIC_LIBRARIES += $(core_static_libraries) LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libjavacrypto @@ -146,8 +145,7 @@ ifeq ($(WITH_HOST_DALVIK),true) # Conscrypt native library for host include $(CLEAR_VARS) LOCAL_SRC_FILES += \ - crypto/src/main/native/org_conscrypt_NativeCrypto.cpp \ - luni/src/main/native/AsynchronousSocketCloseMonitor.cpp + crypto/src/main/native/org_conscrypt_NativeCrypto.cpp LOCAL_C_INCLUDES += $(core_c_includes) \ libcore/luni/src/main/native LOCAL_CPPFLAGS += $(core_cppflags) @@ -156,15 +154,14 @@ ifeq ($(WITH_HOST_DALVIK),true) LOCAL_MODULE := libjavacrypto LOCAL_CFLAGS += -DJNI_JARJAR_PREFIX="com/android/" LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/NativeCode.mk - LOCAL_SHARED_LIBRARIES += $(core_shared_libraries) libssl-host libcrypto-host + LOCAL_SHARED_LIBRARIES += $(core_shared_libraries) libssl-host libcrypto-host libjavacore LOCAL_STATIC_LIBRARIES += $(core_static_libraries) include $(BUILD_HOST_SHARED_LIBRARY) # Conscrypt native library for nojarjar'd version include $(CLEAR_VARS) LOCAL_SRC_FILES += \ - crypto/src/main/native/org_conscrypt_NativeCrypto.cpp \ - luni/src/main/native/AsynchronousSocketCloseMonitor.cpp + crypto/src/main/native/org_conscrypt_NativeCrypto.cpp LOCAL_C_INCLUDES += $(core_c_includes) \ libcore/luni/src/main/native LOCAL_CPPFLAGS += $(core_cppflags) @@ -172,7 +169,7 @@ ifeq ($(WITH_HOST_DALVIK),true) LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libconscrypt_jni LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/NativeCode.mk - LOCAL_SHARED_LIBRARIES += $(core_shared_libraries) libssl-host libcrypto-host + LOCAL_SHARED_LIBRARIES += $(core_shared_libraries) libssl-host libcrypto-host libjavacore LOCAL_STATIC_LIBRARIES += $(core_static_libraries) include $(BUILD_HOST_SHARED_LIBRARY) |