diff options
| author | Adam Langley <agl@google.com> | 2015-05-20 03:03:19 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-20 03:03:19 +0000 |
| commit | 305983601d04892887603b9a14695f58d9bc2481 (patch) | |
| tree | 968549bb8054086c229991589bb266347aa45e48 | |
| parent | 93c9b73d867a7bc5d155666991505f4908859935 (diff) | |
| parent | 71cbcbedb24dacc402647b2e8b2a52b76cf5cfc2 (diff) | |
| download | external_boringssl-305983601d04892887603b9a14695f58d9bc2481.zip external_boringssl-305983601d04892887603b9a14695f58d9bc2481.tar.gz external_boringssl-305983601d04892887603b9a14695f58d9bc2481.tar.bz2 | |
am 71cbcbed: external/boringssl: add -Wno-unused-parameters.
* commit '71cbcbedb24dacc402647b2e8b2a52b76cf5cfc2':
external/boringssl: add -Wno-unused-parameters.
| -rw-r--r-- | Android.mk | 13 |
1 files changed, 9 insertions, 4 deletions
@@ -13,6 +13,7 @@ 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 +LOCAL_CFLAGS = -Wno-unused-parameters # sha256-armv4.S does not compile with clang. LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as ifeq ($(TARGET_ARCH),arm64) @@ -29,7 +30,7 @@ LOCAL_MODULE_TAGS := optional 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_CFLAGS += -fvisibility=hidden -DBORINGSSL_SHARED_LIBRARY -DBORINGSSL_IMPLEMENTATION -Wno-unused-parameters LOCAL_SDK_VERSION := 9 # sha256-armv4.S does not compile with clang. LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as @@ -48,6 +49,7 @@ LOCAL_CPP_EXTENSION := cc LOCAL_MODULE := bssl LOCAL_MODULE_TAGS := optional LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/sources.mk +LOCAL_CFLAGS = -Wno-unused-parameters LOCAL_SHARED_LIBRARIES=libcrypto libssl include $(LOCAL_PATH)/sources.mk LOCAL_SRC_FILES = $(tool_sources) @@ -59,6 +61,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_CFLAGS = -Wno-unused-parameters # Windows and Macs both have problems with assembly files ifneq ($(HOST_OS),linux) LOCAL_CFLAGS += -DOPENSSL_NO_ASM @@ -73,7 +76,7 @@ LOCAL_MODULE := libcrypto-host LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include LOCAL_MULTILIB := both LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/crypto-sources.mk -LOCAL_CFLAGS += -fvisibility=hidden -DBORINGSSL_SHARED_LIBRARY -DBORINGSSL_IMPLEMENTATION +LOCAL_CFLAGS += -fvisibility=hidden -DBORINGSSL_SHARED_LIBRARY -DBORINGSSL_IMPLEMENTATION -Wno-unused-parameters # Windows and Macs both have problems with assembly files ifneq ($(HOST_OS),linux) LOCAL_CFLAGS += -DOPENSSL_NO_ASM @@ -91,6 +94,7 @@ 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 +LOCAL_CFLAGS = -Wno-unused-parameters include $(LOCAL_PATH)/ssl-sources.mk include $(BUILD_STATIC_LIBRARY) @@ -100,7 +104,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libssl 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_CFLAGS += -fvisibility=hidden -DBORINGSSL_SHARED_LIBRARY -DBORINGSSL_IMPLEMENTATION -Wno-unused-parameters LOCAL_SHARED_LIBRARIES=libcrypto LOCAL_SDK_VERSION := 9 include $(LOCAL_PATH)/ssl-sources.mk @@ -112,6 +116,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libssl_static-host LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/src/include LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/ssl-sources.mk +LOCAL_CFLAGS = -Wno-unused-parameters include $(LOCAL_PATH)/ssl-sources.mk include $(BUILD_HOST_STATIC_LIBRARY) @@ -122,7 +127,7 @@ LOCAL_MODULE := libssl-host LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/src/include LOCAL_MULTILIB := both LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/ssl-sources.mk -LOCAL_CFLAGS += -fvisibility=hidden -DBORINGSSL_SHARED_LIBRARY -DBORINGSSL_IMPLEMENTATION +LOCAL_CFLAGS += -fvisibility=hidden -DBORINGSSL_SHARED_LIBRARY -DBORINGSSL_IMPLEMENTATION -Wno-unused-parameters LOCAL_SHARED_LIBRARIES += libcrypto-host include $(LOCAL_PATH)/ssl-sources.mk include $(BUILD_HOST_SHARED_LIBRARY) |