diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2014-06-24 11:12:30 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2014-06-24 11:12:30 +0200 |
| commit | eb7891f0af9b787202e91e903b612eb2467ca870 (patch) | |
| tree | dd2ad0eac533dca54f6ae2231430052bf8860a9d /main/openssl/Apps.mk | |
| parent | 830aec478ff774bf8beeb321f5f67a08a133e95f (diff) | |
Update OpenSSL to aosp/master
--HG--
extra : amend_source : 1d737bc919a18f072b1038b548a2cbad4cf76e22
Diffstat (limited to 'main/openssl/Apps.mk')
| -rw-r--r-- | main/openssl/Apps.mk | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/main/openssl/Apps.mk b/main/openssl/Apps.mk index 3fb94dbe..b2d871c1 100644 --- a/main/openssl/Apps.mk +++ b/main/openssl/Apps.mk @@ -1,9 +1,12 @@ # Copyright 2006 The Android Open Source Project -LOCAL_PATH:= $(call my-dir) +LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE:= openssl +LOCAL_MODULE := openssl +LOCAL_MULTILIB := both +LOCAL_MODULE_STEM_32 := openssl +LOCAL_MODULE_STEM_64 := openssl64 LOCAL_CLANG := true LOCAL_MODULE_TAGS := optional LOCAL_SHARED_LIBRARIES := libssl libcrypto @@ -13,7 +16,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/android-config.mk $(LOCAL_PATH)/A include $(BUILD_EXECUTABLE) include $(CLEAR_VARS) -LOCAL_MODULE:= openssl +LOCAL_MODULE := openssl LOCAL_MODULE_TAGS := optional LOCAL_SHARED_LIBRARIES := libssl-host libcrypto-host include $(LOCAL_PATH)/Apps-config-host.mk |