From dbfa1800f3b4f00609142853f43897e760eb33c2 Mon Sep 17 00:00:00 2001
From: Adam Langley <agl@google.com>
Date: Thu, 21 May 2015 11:20:21 -0700
Subject: s/-Wno-unused-parameters/-Wno-unused-parameter/
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The former triggers warnings in Clang. Also USE_CLANG_PLATFORM_BUILD=1
doesn't work (the second time this has bitten me—you have to set it to
“true”).

(cherry picked from commit 86426f7cc9838613249690be03ddbee18efd1a29)

Bug: 21804522
Change-Id: Ia59f6667674c1c69bd96287cc576bbfc889c5f77
---
 Android.mk | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Android.mk b/Android.mk
index ffbdbc0..66f6033 100644
--- a/Android.mk
+++ b/Android.mk
@@ -13,7 +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
+LOCAL_CFLAGS = -Wno-unused-parameter
 # sha256-armv4.S does not compile with clang.
 LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as
 ifeq ($(TARGET_ARCH),arm64)
@@ -30,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 -Wno-unused-parameters
+LOCAL_CFLAGS += -fvisibility=hidden -DBORINGSSL_SHARED_LIBRARY -DBORINGSSL_IMPLEMENTATION -Wno-unused-parameter
 LOCAL_SDK_VERSION := 9
 # sha256-armv4.S does not compile with clang.
 LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as
@@ -49,7 +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_CFLAGS = -Wno-unused-parameter
 LOCAL_SHARED_LIBRARIES=libcrypto libssl
 include $(LOCAL_PATH)/sources.mk
 LOCAL_SRC_FILES = $(tool_sources)
@@ -61,7 +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
+LOCAL_CFLAGS = -Wno-unused-parameter
 # Windows and Macs both have problems with assembly files
 ifneq ($(HOST_OS),linux)
 LOCAL_CFLAGS += -DOPENSSL_NO_ASM
@@ -76,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 -Wno-unused-parameters
+LOCAL_CFLAGS += -fvisibility=hidden -DBORINGSSL_SHARED_LIBRARY -DBORINGSSL_IMPLEMENTATION -Wno-unused-parameter
 # Windows and Macs both have problems with assembly files
 ifneq ($(HOST_OS),linux)
 LOCAL_CFLAGS += -DOPENSSL_NO_ASM
@@ -94,7 +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
+LOCAL_CFLAGS = -Wno-unused-parameter
 include $(LOCAL_PATH)/ssl-sources.mk
 include $(BUILD_STATIC_LIBRARY)
 
@@ -104,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 -Wno-unused-parameters
+LOCAL_CFLAGS += -fvisibility=hidden -DBORINGSSL_SHARED_LIBRARY -DBORINGSSL_IMPLEMENTATION -Wno-unused-parameter
 LOCAL_SHARED_LIBRARIES=libcrypto
 LOCAL_SDK_VERSION := 9
 include $(LOCAL_PATH)/ssl-sources.mk
@@ -116,7 +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
+LOCAL_CFLAGS = -Wno-unused-parameter
 include $(LOCAL_PATH)/ssl-sources.mk
 include $(BUILD_HOST_STATIC_LIBRARY)
 
@@ -127,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 -Wno-unused-parameters
+LOCAL_CFLAGS += -fvisibility=hidden -DBORINGSSL_SHARED_LIBRARY -DBORINGSSL_IMPLEMENTATION -Wno-unused-parameter
 LOCAL_SHARED_LIBRARIES += libcrypto-host
 include $(LOCAL_PATH)/ssl-sources.mk
 include $(BUILD_HOST_SHARED_LIBRARY)
-- 
cgit v1.1