2 files changed, 23 insertions, 56 deletions
diff --git a/webrtc/modules/audio_processing/vad/Android.bp b/webrtc/modules/audio_processing/vad/Android.bp
new file mode 100644
index 0000000000..6e67167407
--- /dev/null
+++ b/webrtc/modules/audio_processing/vad/Android.bp
@@ -0,0 +1,23 @@
+// Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
+//
+// Use of this source code is governed by a BSD-style license
+// that can be found in the LICENSE file in the root of the source
+// tree. An additional intellectual property rights grant can be found
+// in the file PATENTS.  All contributing project authors may
+// be found in the AUTHORS file in the root of the source tree.
+
+cc_library_static {
+    name: "libwebrtc_apvad",
+    defaults: ["webrtc_flags"],
+
+    srcs: [
+        "gmm.cc",
+        "pitch_based_vad.cc",
+        "pitch_internal.cc",
+        "pole_zero_filter.cc",
+        "standalone_vad.cc",
+        "vad_audio_proc.cc",
+        "vad_circular_buffer.cc",
+        "voice_activity_detector.cc",
+    ],
+}
diff --git a/webrtc/modules/audio_processing/vad/Android.mk b/webrtc/modules/audio_processing/vad/Android.mk
deleted file mode 100644
index 6ac938ad1b..0000000000
--- a/webrtc/modules/audio_processing/vad/Android.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
-#
-# Use of this source code is governed by a BSD-style license
-# that can be found in the LICENSE file in the root of the source
-# tree. An additional intellectual property rights grant can be found
-# in the file PATENTS.  All contributing project authors may
-# be found in the AUTHORS file in the root of the source tree.
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-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 := \
-    gmm.cc \
-    pitch_based_vad.cc \
-    pitch_internal.cc \
-    pole_zero_filter.cc \
-    standalone_vad.cc \
-    vad_audio_proc.cc \
-    vad_circular_buffer.cc \
-    voice_activity_detector.cc \
-
-# Flags passed to both C and C++ files.
-LOCAL_CFLAGS := \
-    $(MY_WEBRTC_COMMON_DEFS)
-
-LOCAL_CFLAGS_arm := $(MY_WEBRTC_COMMON_DEFS_arm)
-LOCAL_CFLAGS_x86 := $(MY_WEBRTC_COMMON_DEFS_x86)
-LOCAL_CFLAGS_mips := $(MY_WEBRTC_COMMON_DEFS_mips)
-LOCAL_CFLAGS_arm64 := $(MY_WEBRTC_COMMON_DEFS_arm64)
-LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64)
-LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64)
-
-LOCAL_CFLAGS += $(MY_WEBRTC_COMMON_CFLAGS_WARNINGS)
-LOCAL_TIDY_CHECKS := $(MY_WEBRTC_COMMON_TIDY_CHECKS)
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH) \
-    $(LOCAL_PATH)/../../../.. \
-
-ifdef WEBRTC_STL
-LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL)
-LOCAL_SDK_VERSION := 14
-LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
-endif
-
-include $(BUILD_STATIC_LIBRARY)