diff options
| author | Kenny Root <kroot@google.com> | 2013-09-16 13:58:19 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2013-09-16 14:21:44 -0700 |
| commit | 58162773b0664d5c5acbc658df4fa1d99f14b691 (patch) | |
| tree | 51d90bd9946d65399c8ca0e8587a3192e4c88080 /NativeCode.mk | |
| parent | 0a455b00964add31681d101091d40e049c543fee (diff) | |
| download | libcore-58162773b0664d5c5acbc658df4fa1d99f14b691.zip libcore-58162773b0664d5c5acbc658df4fa1d99f14b691.tar.gz libcore-58162773b0664d5c5acbc658df4fa1d99f14b691.tar.bz2 | |
Split Conscrypt makefile out from libcore
Change-Id: I6c12a0e038a86b186b5d88b9f0ff28b8480b4aed
Diffstat (limited to 'NativeCode.mk')
| -rw-r--r-- | NativeCode.mk | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/NativeCode.mk b/NativeCode.mk index b7e8a4e..c85e22f 100644 --- a/NativeCode.mk +++ b/NativeCode.mk @@ -89,22 +89,6 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/NativeCode.mk include external/stlport/libstlport.mk include $(BUILD_SHARED_LIBRARY) -# Platform conscrypt crypto library -include $(CLEAR_VARS) -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 -LOCAL_C_INCLUDES += $(core_c_includes) \ - libcore/luni/src/main/native -LOCAL_SHARED_LIBRARIES += $(core_shared_libraries) libcrypto libssl libnativehelper libz libjavacore -LOCAL_STATIC_LIBRARIES += $(core_static_libraries) -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE := libjavacrypto -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/NativeCode.mk -include $(BUILD_SHARED_LIBRARY) - # Test JNI library. ifeq ($(LIBCORE_SKIP_TESTS),) @@ -141,37 +125,6 @@ ifeq ($(WITH_HOST_DALVIK),true) LOCAL_STATIC_LIBRARIES += $(core_static_libraries) include $(BUILD_HOST_SHARED_LIBRARY) - # Conscrypt native library for host - include $(CLEAR_VARS) - LOCAL_SRC_FILES += \ - crypto/src/main/native/org_conscrypt_NativeCrypto.cpp - LOCAL_C_INCLUDES += $(core_c_includes) \ - libcore/luni/src/main/native - LOCAL_CPPFLAGS += $(core_cppflags) - LOCAL_LDLIBS += -lpthread - LOCAL_MODULE_TAGS := optional - 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 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 - LOCAL_C_INCLUDES += $(core_c_includes) \ - libcore/luni/src/main/native - LOCAL_CPPFLAGS += $(core_cppflags) - LOCAL_LDLIBS += -lpthread - 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 libjavacore - LOCAL_STATIC_LIBRARIES += $(core_static_libraries) - include $(BUILD_HOST_SHARED_LIBRARY) - ifeq ($(LIBCORE_SKIP_TESTS),) include $(CLEAR_VARS) LOCAL_SRC_FILES += $(core_test_files) |