commit 1fed59c2220ae8fe1922301482ab3fcf3f7d6672
author Allen Webb <allenwebb@google.com> Wed May 13 12:58:03 2020 -0700
committer Commit Bot <commit-bot@chromium.org> Thu May 21 10:27:23 2020 +0000
tree 0ec9d1ff059ced2f8d051c7c40762876a2f5e1e6
parent 16fa2519839778c4223ddbc0707561b9d6ce4053

Fix build for protobuf 3.11.4

BUG=chromium:1082352
TEST=build_packages with CL:2197715

Change-Id: I2e932dd5050449ea66e74e5fc5022e6fb54239d5
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/webrtc-apm/+/2199899
Tested-by: Allen Webb <allenwebb@google.com>
Reviewed-by: Hsinyu Chao <hychao@chromium.org>
Commit-Queue: Allen Webb <allenwebb@google.com>

Makefile

diff --git a/Makefile b/Makefile
index 3025aed..c136a30 100644
--- a/Makefile
+++ b/Makefile
@@ -46,6 +46,6 @@
 	absl.pic.a \
 	cras-config.pic.a \
 	$(call get_pc_libs,$(webrtc_apm_PC_DEPS)) \
-	-liniparser
+	-liniparser -pthread
 
 all: CXX_LIBRARY(libwebrtc_apm.so)

common.mk

diff --git a/common.mk b/common.mk
index e05d85a..6ae6e6f 100644
--- a/common.mk
+++ b/common.mk
@@ -320,7 +320,8 @@
 COMMON_CFLAGS-gcc := -fvisibility=internal -ggdb3 -Wa,--noexecstack
 COMMON_CFLAGS-clang := -fvisibility=hidden -ggdb \
   -Wno-implicit-int-float-conversion
-COMMON_CFLAGS := -Wall -Wunused -Wno-unused-parameter -Werror -Wformat=2 \
+COMMON_CFLAGS := -Wall -Wunused -Wno-unused-parameter \
+  -Werror -Wno-error=deprecated-declarations -Wformat=2 \
   -fno-strict-aliasing $(SSP_CFLAGS) -O1
 CXXFLAGS += $(COMMON_CFLAGS) $(COMMON_CFLAGS-$(CXXDRIVER)) -std=gnu++14
 CFLAGS += $(COMMON_CFLAGS) $(COMMON_CFLAGS-$(CDRIVER)) -std=gnu11