2 files changed, 20 insertions, 44 deletions
diff --git a/webrtc/modules/audio_processing/utility/Android.bp b/webrtc/modules/audio_processing/utility/Android.bp
new file mode 100644
index 0000000000..24f1aecd01
--- /dev/null
+++ b/webrtc/modules/audio_processing/utility/Android.bp
@@ -0,0 +1,20 @@
+// Copyright (c) 2011 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_apm_utility",
+    defaults: ["webrtc_flags"],
+
+    srcs: [
+        "delay_estimator.c",
+        "delay_estimator_wrapper.c",
+    ],
+
+    export_include_dirs: ["."],
+    static_libs: ["libwebrtc_spl"],
+}
diff --git a/webrtc/modules/audio_processing/utility/Android.mk b/webrtc/modules/audio_processing/utility/Android.mk
deleted file mode 100644
index c545436e46..0000000000
--- a/webrtc/modules/audio_processing/utility/Android.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright (c) 2011 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_apm_utility
-LOCAL_VENDOR_MODULE := true
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := \
-    delay_estimator.c \
-    delay_estimator_wrapper.c
-
-# 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)/../../../.. \
-    $(LOCAL_PATH)/../../../common_audio/signal_processing/include
-
-include $(BUILD_STATIC_LIBRARY)