Merge "Convert external/libgsm to Android.bp" am: c06febc81b am: f433a3841b am: 4ccb7e359boreo-dr1-dev

am: 8dc0fc7e41

Change-Id: I957b11d7411fd9ada84c7526e6e0ec13fe4d92de

2 files changed, 46 insertions, 49 deletions

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..ff6e739
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,46 @@
+//
+// Copyright (C) 2010 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+cc_library_static {
+    name: "libgsm",
+
+    srcs: [
+        "src/add.c",
+        "src/code.c",
+        "src/decode.c",
+        "src/gsm_create.c",
+        "src/gsm_decode.c",
+        "src/gsm_destroy.c",
+        "src/gsm_encode.c",
+        "src/gsm_option.c",
+        "src/long_term.c",
+        "src/lpc.c",
+        "src/preprocess.c",
+        "src/rpe.c",
+        "src/short_term.c",
+        "src/table.c",
+    ],
+
+    cflags: [
+        "-DSASR",
+        "-DWAV49",
+        "-Wno-unused-parameter",
+        "-Wno-shift-negative-value",
+        "-Werror",
+    ],
+
+    export_include_dirs: ["inc"],
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 5d47d37..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Copyright (C) 2010 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
-	src/add.c \
-	src/code.c \
-	src/decode.c \
-	src/gsm_create.c \
-	src/gsm_decode.c \
-	src/gsm_destroy.c \
-	src/gsm_encode.c \
-	src/gsm_option.c \
-	src/long_term.c \
-	src/lpc.c \
-	src/preprocess.c \
-	src/rpe.c \
-	src/short_term.c \
-	src/table.c
-
-LOCAL_CFLAGS := \
-    -DSASR \
-    -DWAV49 \
-    -Wno-unused-parameter \
-    -Wno-shift-negative-value \
-    -Werror
-
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/inc
-
-LOCAL_MODULE := libgsm
-
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_STATIC_LIBRARY)