commit c2a068aa3bd9f7286c96c5998e59520e26102350
author Treehugger Robot <treehugger-gerrit@google.com> Wed Oct 25 05:54:49 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 25 05:54:49 2017 +0000
tree e4c5f1c9a48fcd66e97653623012b6aff28d6440
parent c1314e44239f4e715ba8f927d02343774f7aa1e9
parent 5ab0db6343ef49357be2f27bc49504b3d4991614

Merge "Convert libmedialogservice to Android.bp"

Android.bp

diff --git a/Android.bp b/Android.bp
index b207a96..4cdb881 100644
--- a/Android.bp
+++ b/Android.bp
@@ -3,5 +3,6 @@
     "drm/*",
     "media/*",
     "radio",
+    "services/*",
     "soundtrigger",
 ]

services/medialog/Android.bp

diff --git a/services/medialog/Android.bp b/services/medialog/Android.bp
new file mode 100644
index 0000000..1f811d3
--- /dev/null
+++ b/services/medialog/Android.bp
@@ -0,0 +1,21 @@
+cc_library_shared {
+    name: "libmedialogservice",
+
+    srcs: [
+        "IMediaLogService.cpp",
+        "MediaLogService.cpp",
+    ],
+
+    shared_libs: [
+        "libaudioutils",
+        "libbinder",
+        "liblog",
+        "libnbaio",
+        "libutils",
+    ],
+
+    cflags: [
+        "-Werror",
+        "-Wall",
+    ],
+}

services/medialog/Android.mk

diff --git a/services/medialog/Android.mk b/services/medialog/Android.mk
deleted file mode 100644
index 423b186..0000000
--- 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 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)