2 files changed, 46 insertions, 69 deletions
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/Android.bp b/webrtc/modules/audio_coding/codecs/isac/main/source/Android.bp
new file mode 100644
index 0000000000..dab60c4034
--- /dev/null
+++ b/webrtc/modules/audio_coding/codecs/isac/main/source/Android.bp
@@ -0,0 +1,46 @@
+// 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_isac",
+    defaults: ["webrtc_flags"],
+
+    srcs: [
+        "arith_routines.c",
+        "arith_routines_hist.c",
+        "arith_routines_logist.c",
+        "bandwidth_estimator.c",
+        "crc.c",
+        "decode.c",
+        "decode_bwe.c",
+        "encode.c",
+        "encode_lpc_swb.c",
+        "entropy_coding.c",
+        "fft.c",
+        "filter_functions.c",
+        "filterbank_tables.c",
+        "filterbanks.c",
+        "intialize.c",
+        "isac.c",
+        "pitch_lag_tables.c",
+        "lattice.c",
+        "lpc_gain_swb_tables.c",
+        "lpc_analysis.c",
+        "lpc_shape_swb12_tables.c",
+        "lpc_shape_swb16_tables.c",
+        "lpc_tables.c",
+        "pitch_estimator.c",
+        "pitch_filter.c",
+        "pitch_gain_tables.c",
+        "spectrum_ar_model_tables.c",
+        "transform.c",
+    ],
+
+    header_libs: ["libwebrtc_isac_interface"],
+    static_libs: ["libwebrtc_spl"],
+}
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/Android.mk b/webrtc/modules/audio_coding/codecs/isac/main/source/Android.mk
deleted file mode 100644
index b5f5415b80..0000000000
--- a/webrtc/modules/audio_coding/codecs/isac/main/source/Android.mk
+++ /dev/null
@@ -1,69 +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_isac
-LOCAL_VENDOR_MODULE := true
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := \
-    arith_routines.c \
-    arith_routines_hist.c \
-    arith_routines_logist.c \
-    bandwidth_estimator.c \
-    crc.c \
-    decode.c \
-    decode_bwe.c \
-    encode.c \
-    encode_lpc_swb.c \
-    entropy_coding.c \
-    fft.c \
-    filter_functions.c \
-    filterbank_tables.c \
-    filterbanks.c \
-    intialize.c \
-    isac.c \
-    pitch_lag_tables.c \
-    lattice.c \
-    lpc_gain_swb_tables.c \
-    lpc_analysis.c \
-    lpc_shape_swb12_tables.c \
-    lpc_shape_swb16_tables.c \
-    lpc_tables.c \
-    pitch_estimator.c \
-    pitch_filter.c \
-    pitch_gain_tables.c \
-    spectrum_ar_model_tables.c \
-    transform.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)
-
-LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/../include \
-    $(LOCAL_PATH)/../../../../../../.. \
-    $(LOCAL_PATH)/../../../../../../common_audio/signal_processing/include
-
-include $(BUILD_STATIC_LIBRARY)