diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2015-04-15 00:17:26 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2015-04-15 00:20:23 +0200 |
| commit | c3ae4aaac9f0b168aed063d3e86c5196608eaba1 (patch) | |
| tree | 1a18e7d8751d4dd3682d82d12c8441b335112984 /main/openssl/Crypto.mk | |
| parent | 5e42114d22faefe7c272b1b498fdf5640da494c7 (diff) | |
Move more to git, add submodules, fix build script, change hgignore to gitignore
Diffstat (limited to 'main/openssl/Crypto.mk')
| m--------- | main/openssl | 0 | ||||
| -rw-r--r-- | main/openssl/Crypto.mk | 77 |
2 files changed, 0 insertions, 77 deletions
diff --git a/main/openssl b/main/openssl new file mode 160000 +Subproject 4d377a9ce111930d8a8f06dc0e94a892a7f6c51 diff --git a/main/openssl/Crypto.mk b/main/openssl/Crypto.mk deleted file mode 100644 index 6935cb67..00000000 --- a/main/openssl/Crypto.mk +++ /dev/null @@ -1,77 +0,0 @@ -####################################### -# target static library -include $(CLEAR_VARS) -include $(LOCAL_PATH)/ndk-build-clear.mk -LOCAL_SHARED_LIBRARIES := $(log_shared_libraries) -LOCAL_C_INCLUDES := $(log_c_includes) - -# The static library should be used in only unbundled apps -# and we don't have clang in unbundled build yet. -LOCAL_SDK_VERSION := 9 - -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE := libcrypto_static -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/android-config.mk $(LOCAL_PATH)/Crypto.mk -include $(LOCAL_PATH)/Crypto-config-target.mk -include $(LOCAL_PATH)/android-config.mk -include $(LOCAL_PATH)/ndk-build.mk - -# Replace cflags with static-specific cflags so we dont build in libdl deps -LOCAL_CFLAGS_32 := $(openssl_cflags_static_32) -LOCAL_CFLAGS_64 := $(openssl_cflags_static_64) -include $(BUILD_STATIC_LIBRARY) - -####################################### -# target shared library -include $(CLEAR_VARS) -include $(LOCAL_PATH)/ndk-build-clear.mk -LOCAL_SHARED_LIBRARIES := $(log_shared_libraries) -LOCAL_C_INCLUDES := $(log_c_includes) - -# If we're building an unbundled build, don't try to use clang since it's not -# in the NDK yet. This can be removed when a clang version that is fast enough -# in the NDK. -ifeq (,$(TARGET_BUILD_APPS)) -LOCAL_CLANG := true -else -LOCAL_SDK_VERSION := 9 -endif -LOCAL_LDFLAGS += -ldl - -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE := libcrypto -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/android-config.mk $(LOCAL_PATH)/Crypto.mk -include $(LOCAL_PATH)/Crypto-config-target.mk -include $(LOCAL_PATH)/android-config.mk -include $(LOCAL_PATH)/ndk-build.mk -include $(BUILD_SHARED_LIBRARY) - -####################################### -# host shared library -# include $(CLEAR_VARS) -# LOCAL_SHARED_LIBRARIES := $(log_shared_libraries) -# LOCAL_C_INCLUDES := $(log_c_includes) -# LOCAL_CFLAGS += -DPURIFY -# LOCAL_LDLIBS += -ldl -# LOCAL_MODULE_TAGS := optional -# LOCAL_MODULE := libcrypto-host -# LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/android-config.mk $(LOCAL_PATH)/Crypto.mk -# LOCAL_MULTILIB := both -# include $(LOCAL_PATH)/Crypto-config-host.mk -# include $(LOCAL_PATH)/android-config.mk -# include $(BUILD_HOST_SHARED_LIBRARY) - -######################################## -# host static library, which is used by some SDK tools. - -# include $(CLEAR_VARS) -# LOCAL_SHARED_LIBRARIES := $(log_shared_libraries) -# LOCAL_C_INCLUDES := $(log_c_includes) -# LOCAL_CFLAGS += -DPURIFY -# LOCAL_LDLIBS += -ldl -# LOCAL_MODULE_TAGS := optional -# LOCAL_MODULE := libcrypto_static -# LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/android-config.mk $(LOCAL_PATH)/Crypto.mk -# include $(LOCAL_PATH)/Crypto-config-host.mk -# include $(LOCAL_PATH)/android-config.mk -# include $(BUILD_HOST_STATIC_LIBRARY) |