From da8082bda261eff00bdcb00bb2eabfcdde138c7f Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Tue, 16 May 2017 13:08:19 -0700
Subject: Convert libsoundpool to Android.bp

See build/soong/README.md for more information.

Test: m -j checkbuild
Change-Id: If0b7cb1e2c86ff1be41c00d98fd9ddec31287a53
Merged-In: If0b7cb1e2c86ff1be41c00d98fd9ddec31287a53
(cherry picked from commit 98c127f8cc652d1179871ad47cac99d15ea1a5a0)
---
 media/jni/Android.bp           |  1 +
 media/jni/soundpool/Android.bp | 28 ++++++++++++++++++++++++++++
 media/jni/soundpool/Android.mk | 23 -----------------------
 3 files changed, 29 insertions(+), 23 deletions(-)
 create mode 100644 media/jni/soundpool/Android.bp
 delete mode 100644 media/jni/soundpool/Android.mk

diff --git a/media/jni/Android.bp b/media/jni/Android.bp
index d419f7e3cae4..d5e2101f3d0d 100644
--- a/media/jni/Android.bp
+++ b/media/jni/Android.bp
@@ -74,4 +74,5 @@ cc_library_shared {
 
 subdirs = [
     "audioeffect",
+    "soundpool",
 ]
diff --git a/media/jni/soundpool/Android.bp b/media/jni/soundpool/Android.bp
new file mode 100644
index 000000000000..35b7b01e207c
--- /dev/null
+++ b/media/jni/soundpool/Android.bp
@@ -0,0 +1,28 @@
+cc_library_shared {
+    name: "libsoundpool",
+
+    srcs: [
+        "android_media_SoundPool.cpp",
+        "SoundPool.cpp",
+        "SoundPoolThread.cpp",
+    ],
+
+    shared_libs: [
+        "liblog",
+        "libcutils",
+        "libutils",
+        "libandroid_runtime",
+        "libnativehelper",
+        "libaudioclient",
+        "libmediandk",
+        "libbinder",
+    ],
+
+    cflags: [
+        "-Wall",
+        "-Werror",
+        "-Wno-error=deprecated-declarations",
+        "-Wunused",
+        "-Wunreachable-code",
+    ],
+}
diff --git a/media/jni/soundpool/Android.mk b/media/jni/soundpool/Android.mk
deleted file mode 100644
index 509a59b549b5..000000000000
--- a/media/jni/soundpool/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES:= \
-    android_media_SoundPool.cpp \
-    SoundPool.cpp \
-    SoundPoolThread.cpp
-
-LOCAL_SHARED_LIBRARIES := \
-    liblog \
-    libcutils \
-    libutils \
-    libandroid_runtime \
-    libnativehelper \
-    libaudioclient \
-    libmediandk \
-    libbinder
-
-LOCAL_MODULE:= libsoundpool
-
-LOCAL_CFLAGS += -Wall -Werror -Wno-error=deprecated-declarations -Wunused -Wunreachable-code
-
-include $(BUILD_SHARED_LIBRARY)
-- 
cgit v1.2.3-59-g8ed1b