release-request-2ec08f61-b94c-464b-8a22-2d354ef71488-for-git_oc-dr1-release-4094616 snap-temp-L42100000073564610android-8.0.0_r34android-8.0.0_r33android-8.0.0_r27android-8.0.0_r26android-8.0.0_r25android-8.0.0_r24android-8.0.0_r23android-8.0.0_r22android-8.0.0_r21oreo-dr3-releaseoreo-dr2-releaseoreo-dr1-release

Change-Id: I0ff74a47ef708eab4244a6f5d7d1bfbf01de5c9a

19 files changed, 26 insertions, 0 deletions

diff --git a/Android.mk b/Android.mk
index 68f756fb02..2112d4dcc5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -13,6 +13,7 @@ include $(LOCAL_PATH)/android-webrtc.mk
 
 LOCAL_ARM_MODE := arm
 LOCAL_MODULE := libwebrtc_audio_preprocessing
+LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_WHOLE_STATIC_LIBRARIES := \
@@ -55,6 +56,7 @@ include $(LOCAL_PATH)/android-webrtc.mk
 
 LOCAL_ARM_MODE := arm
 LOCAL_MODULE := libwebrtc_audio_coding
+LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_WHOLE_STATIC_LIBRARIES := \
@@ -86,6 +88,7 @@ include $(LOCAL_PATH)/android-webrtc.mk
 
 LOCAL_ARM_MODE := arm
 LOCAL_MODULE := libwebrtc_audio_coding_gnustl_static
+LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_WHOLE_STATIC_LIBRARIES := \
diff --git a/webrtc/base/Android.mk b/webrtc/base/Android.mk
index aefe375471..33ce5b61f0 100644
--- a/webrtc/base/Android.mk
+++ b/webrtc/base/Android.mk
@@ -15,6 +15,7 @@ include $(LOCAL_PATH)/../../android-webrtc.mk
 LOCAL_ARM_MODE := arm
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 LOCAL_MODULE := libwebrtc_base
+LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE_TAGS := optional
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_SRC_FILES := \
@@ -53,4 +54,6 @@ LOCAL_SDK_VERSION := 14
 LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
 endif
 
+LOCAL_SHARED_LIBRARIES += liblog
+
 include $(BUILD_STATIC_LIBRARY)
diff --git a/webrtc/common_audio/Android.mk b/webrtc/common_audio/Android.mk
index b3e58976e4..7e68367ff1 100644
--- a/webrtc/common_audio/Android.mk
+++ b/webrtc/common_audio/Android.mk
@@ -15,6 +15,7 @@ include $(LOCAL_PATH)/../../android-webrtc.mk
 LOCAL_ARM_MODE := arm
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 LOCAL_MODULE := libwebrtc_common
+LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE_TAGS := optional
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_SRC_FILES := \
diff --git a/webrtc/common_audio/resampler/Android.mk b/webrtc/common_audio/resampler/Android.mk
index b9feb483d1..1aa4dd2ae4 100644
--- a/webrtc/common_audio/resampler/Android.mk
+++ b/webrtc/common_audio/resampler/Android.mk
@@ -15,6 +15,7 @@ include $(LOCAL_PATH)/../../../android-webrtc.mk
 LOCAL_ARM_MODE := arm
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 LOCAL_MODULE := libwebrtc_resampler
+LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE_TAGS := optional
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_SRC_FILES := \
diff --git a/webrtc/common_audio/signal_processing/Android.mk b/webrtc/common_audio/signal_processing/Android.mk
index 5f94db6e33..5b2a41afd2 100644
--- a/webrtc/common_audio/signal_processing/Android.mk
+++ b/webrtc/common_audio/signal_processing/Android.mk
@@ -15,6 +15,7 @@ include $(LOCAL_PATH)/../../../android-webrtc.mk
 LOCAL_ARM_MODE := arm
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 LOCAL_MODULE := libwebrtc_spl
+LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := \
     auto_corr_to_refl_coef.c \
diff --git a/webrtc/common_audio/vad/Android.mk b/webrtc/common_audio/vad/Android.mk
index fff03b9a29..f310cd4a7f 100644
--- a/webrtc/common_audio/vad/Android.mk
+++ b/webrtc/common_audio/vad/Android.mk
@@ -15,6 +15,7 @@ include $(LOCAL_PATH)/../../../android-webrtc.mk
 LOCAL_ARM_MODE := arm
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 LOCAL_MODULE := libwebrtc_vad
+LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := \
     webrtc_vad.c \
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/Android.mk b/webrtc/modules/audio_coding/codecs/isac/fix/source/Android.mk
index d1f6086651..c409af2fff 100644
--- a/webrtc/modules/audio_coding/codecs/isac/fix/source/Android.mk
+++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/Android.mk
@@ -18,6 +18,7 @@ include $(LOCAL_PATH)/../../../../../../../android-webrtc.mk
 LOCAL_ARM_MODE := arm
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 LOCAL_MODULE := libwebrtc_isacfix
+LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := \
     arith_routines.c \
@@ -98,6 +99,7 @@ include $(CLEAR_VARS)
 LOCAL_ARM_MODE := arm
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 LOCAL_MODULE := libwebrtc_isacfix_neon
+LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := \
     filters_neon.c \
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/Android.mk b/webrtc/modules/audio_coding/codecs/isac/main/source/Android.mk
index 8694f81c99..e9bfbbbb41 100644
--- a/webrtc/modules/audio_coding/codecs/isac/main/source/Android.mk
+++ b/webrtc/modules/audio_coding/codecs/isac/main/source/Android.mk
@@ -15,6 +15,7 @@ include $(LOCAL_PATH)/../../../../../../../android-webrtc.mk
 LOCAL_ARM_MODE := arm
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 LOCAL_MODULE := libwebrtc_isac
+LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := \
     arith_routines.c \
diff --git a/webrtc/modules/audio_processing/Android.mk b/webrtc/modules/audio_processing/Android.mk
index ceacd705c7..dbe426d1a1 100644
--- a/webrtc/modules/audio_processing/Android.mk
+++ b/webrtc/modules/audio_processing/Android.mk
@@ -14,6 +14,7 @@ include $(LOCAL_PATH)/../../../android-webrtc.mk
 
 LOCAL_ARM_MODE := arm
 LOCAL_MODULE := libwebrtc_apm
+LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE_TAGS := optional
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_SRC_FILES := \
diff --git a/webrtc/modules/audio_processing/aec/Android.mk b/webrtc/modules/audio_processing/aec/Android.mk
index a336a225d6..dbc5ed16c8 100644
--- a/webrtc/modules/audio_processing/aec/Android.mk
+++ b/webrtc/modules/audio_processing/aec/Android.mk
@@ -14,6 +14,7 @@ include $(LOCAL_PATH)/../../../../android-webrtc.mk
 
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 LOCAL_MODULE := libwebrtc_aec
+LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := \
     echo_cancellation.c \
diff --git a/webrtc/modules/audio_processing/aecm/Android.mk b/webrtc/modules/audio_processing/aecm/Android.mk
index a960000ec2..6f4ac2e793 100644
--- a/webrtc/modules/audio_processing/aecm/Android.mk
+++ b/webrtc/modules/audio_processing/aecm/Android.mk
@@ -18,6 +18,7 @@ include $(LOCAL_PATH)/../../../../android-webrtc.mk
 LOCAL_ARM_MODE := arm
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 LOCAL_MODULE := libwebrtc_aecm
+LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := \
     echo_control_mobile.c \
@@ -64,6 +65,7 @@ include $(CLEAR_VARS)
 LOCAL_ARM_MODE := arm
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 LOCAL_MODULE := libwebrtc_aecm_neon
+LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_SRC_FILES := aecm_core_neon.c
diff --git a/webrtc/modules/audio_processing/agc/Android.mk b/webrtc/modules/audio_processing/agc/Android.mk
index a361130adc..ef75e868b5 100644
--- a/webrtc/modules/audio_processing/agc/Android.mk
+++ b/webrtc/modules/audio_processing/agc/Android.mk
@@ -15,6 +15,7 @@ include $(LOCAL_PATH)/../../../../android-webrtc.mk
 LOCAL_ARM_MODE := arm
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 LOCAL_MODULE := libwebrtc_agc
+LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE_TAGS := optional
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_SRC_FILES := \
diff --git a/webrtc/modules/audio_processing/beamformer/Android.mk b/webrtc/modules/audio_processing/beamformer/Android.mk
index 426a405f48..4edce26992 100644
--- a/webrtc/modules/audio_processing/beamformer/Android.mk
+++ b/webrtc/modules/audio_processing/beamformer/Android.mk
@@ -15,6 +15,7 @@ include $(LOCAL_PATH)/../../../../android-webrtc.mk
 LOCAL_ARM_MODE := arm
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 LOCAL_MODULE := libwebrtc_beamformer
+LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE_TAGS := optional
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_SRC_FILES := \
diff --git a/webrtc/modules/audio_processing/intelligibility/Android.mk b/webrtc/modules/audio_processing/intelligibility/Android.mk
index b13356de9d..5328c898fe 100644
--- a/webrtc/modules/audio_processing/intelligibility/Android.mk
+++ b/webrtc/modules/audio_processing/intelligibility/Android.mk
@@ -15,6 +15,7 @@ include $(LOCAL_PATH)/../../../../android-webrtc.mk
 LOCAL_ARM_MODE := arm
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 LOCAL_MODULE := libwebrtc_intell
+LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE_TAGS := optional
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_SRC_FILES := \
diff --git a/webrtc/modules/audio_processing/ns/Android.mk b/webrtc/modules/audio_processing/ns/Android.mk
index cd49910b75..6370f4b648 100644
--- a/webrtc/modules/audio_processing/ns/Android.mk
+++ b/webrtc/modules/audio_processing/ns/Android.mk
@@ -16,6 +16,7 @@ include $(LOCAL_PATH)/../../../../android-webrtc.mk
 
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 LOCAL_MODULE := libwebrtc_ns
+LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE_TAGS := optional
 LOCAL_GENERATED_SOURCES :=
 LOCAL_SRC_FILES := \
@@ -66,6 +67,7 @@ include $(CLEAR_VARS)
 LOCAL_ARM_MODE := arm
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 LOCAL_MODULE := libwebrtc_ns_neon
+LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE_TAGS := optional
 
 ifeq ($(TARGET_ARCH), arm64)
diff --git a/webrtc/modules/audio_processing/transient/Android.mk b/webrtc/modules/audio_processing/transient/Android.mk
index 060bdeabf5..d35fb2ac16 100644
--- a/webrtc/modules/audio_processing/transient/Android.mk
+++ b/webrtc/modules/audio_processing/transient/Android.mk
@@ -15,6 +15,7 @@ include $(LOCAL_PATH)/../../../../android-webrtc.mk
 LOCAL_ARM_MODE := arm
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 LOCAL_MODULE := libwebrtc_transient
+LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE_TAGS := optional
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_SRC_FILES := \
diff --git a/webrtc/modules/audio_processing/utility/Android.mk b/webrtc/modules/audio_processing/utility/Android.mk
index b2d482222f..ac76b9510e 100644
--- a/webrtc/modules/audio_processing/utility/Android.mk
+++ b/webrtc/modules/audio_processing/utility/Android.mk
@@ -15,6 +15,7 @@ include $(LOCAL_PATH)/../../../../android-webrtc.mk
 LOCAL_ARM_MODE := arm
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 LOCAL_MODULE := libwebrtc_apm_utility
+LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := \
     delay_estimator.c \
diff --git a/webrtc/modules/audio_processing/vad/Android.mk b/webrtc/modules/audio_processing/vad/Android.mk
index 64af13cbea..d3e13288f6 100644
--- a/webrtc/modules/audio_processing/vad/Android.mk
+++ b/webrtc/modules/audio_processing/vad/Android.mk
@@ -15,6 +15,7 @@ include $(LOCAL_PATH)/../../../../android-webrtc.mk
 LOCAL_ARM_MODE := arm
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 LOCAL_MODULE := libwebrtc_apvad
+LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE_TAGS := optional
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_SRC_FILES := \
diff --git a/webrtc/system_wrappers/source/Android.mk b/webrtc/system_wrappers/source/Android.mk
index 91cbb4c1d4..c80861124f 100644
--- a/webrtc/system_wrappers/source/Android.mk
+++ b/webrtc/system_wrappers/source/Android.mk
@@ -14,6 +14,7 @@ include $(LOCAL_PATH)/../../../android-webrtc.mk
 
 LOCAL_ARM_MODE := arm
 LOCAL_MODULE := libwebrtc_system_wrappers
+LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE_TAGS := optional
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_SRC_FILES := \