From efbff675a701d59455004db93736eaca801e5453 Mon Sep 17 00:00:00 2001
From: Dan Willemsen <dwillemsen@google.com>
Date: Mon, 23 Oct 2017 17:51:23 -0700
Subject: [PATCH] Convert libmedialogservice to Android.bp

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

Removes AUDIOSERVER_MULTILIB which doesn't effectively do much for this
code -- we'll only build and install the versions necessary to support
the libraries/binaries depending on this library.

Test: mmma frameworks/av/services/medialog
Change-Id: Id47b1de95d3c62f0d2dbef69b26fefd6128e7f7e
---
 Android.bp                   |  1 +
 services/medialog/Android.bp | 22 ++++++++++++++++++++++
 services/medialog/Android.mk | 17 -----------------
 3 files changed, 23 insertions(+), 17 deletions(-)
 create mode 100644 services/medialog/Android.bp
 delete mode 100644 services/medialog/Android.mk

diff --git a/Android.bp b/Android.bp
index a3679b168b..e4f12c8460 100644
--- a/Android.bp
+++ b/Android.bp
@@ -2,5 +2,6 @@ subdirs = [
     "camera",
     "drm/*",
     "media/*",
+    "services/*",
     "soundtrigger",
 ]
diff --git a/services/medialog/Android.bp b/services/medialog/Android.bp
new file mode 100644
index 0000000000..29e6dfcd68
--- /dev/null
+++ b/services/medialog/Android.bp
@@ -0,0 +1,22 @@
+cc_library_shared {
+    name: "libmedialogservice",
+
+    srcs: [
+        "IMediaLogService.cpp",
+        "MediaLogService.cpp",
+    ],
+
+    shared_libs: [
+        "libaudioutils",
+        "libbinder",
+        "liblog",
+        "libnbaio",
+        "libnblog",
+        "libutils",
+    ],
+
+    cflags: [
+        "-Werror",
+        "-Wall",
+    ],
+}
diff --git a/services/medialog/Android.mk b/services/medialog/Android.mk
deleted file mode 100644
index 4f2630e34f..0000000000
--- a/services/medialog/Android.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := MediaLogService.cpp IMediaLogService.cpp
-
-LOCAL_SHARED_LIBRARIES := libbinder libutils liblog libnbaio libnblog libaudioutils
-
-LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB)
-
-LOCAL_MODULE:= libmedialogservice
-
-LOCAL_C_INCLUDES := $(call include-path-for, audio-utils)
-
-LOCAL_CFLAGS := -Werror -Wall
-
-include $(BUILD_SHARED_LIBRARY)