Convert libsoundtriggerservice to Android.bp
See build/soong/README.md for more information.
Removed AUDIOSERVER_MULTILIB because it should be unnecessary -- almost
every device does not set it, and the only other value is "64" for
64-bit only devices, which will act the same as "" for libraries.
Test: cd frameworks/av; mma
Change-Id: I8f62a549bcd5ea9eaf9aa6ead48ca6748a31c873
diff --git a/services/soundtrigger/Android.bp b/services/soundtrigger/Android.bp
new file mode 100644
index 0000000..1f2283a
--- /dev/null
+++ b/services/soundtrigger/Android.bp
@@ -0,0 +1,54 @@
+// Copyright 2014 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_shared {
+ name: "libsoundtriggerservice",
+
+ srcs: [
+ "SoundTriggerHwService.cpp",
+ "SoundTriggerHalHidl.cpp",
+ ],
+
+ shared_libs: [
+ "liblog",
+ "libutils",
+ "libbinder",
+ "libcutils",
+ "libhardware",
+ "libsoundtrigger",
+ "libaudioclient",
+ "libmediautils",
+
+ "libhwbinder",
+ "libhidlbase",
+ "libhidlmemory",
+ "libhidltransport",
+ "libbase",
+ "libaudiohal",
+ "libaudiohal_deathhandler",
+ "android.hardware.soundtrigger@2.0",
+ "android.hardware.soundtrigger@2.1",
+ "android.hardware.soundtrigger@2.2",
+ "android.hardware.audio.common@2.0",
+ "android.hidl.allocator@1.0",
+ "android.hidl.memory@1.0",
+ ],
+
+ include_dirs: ["frameworks/av/services/audioflinger"],
+
+ cflags: [
+ "-Wall",
+ "-Werror",
+ ],
+}
diff --git a/services/soundtrigger/Android.mk b/services/soundtrigger/Android.mk
deleted file mode 100644
index 0f09393..0000000
--- a/services/soundtrigger/Android.mk
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 2014 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:= \
- SoundTriggerHwService.cpp
-
-LOCAL_SHARED_LIBRARIES:= \
- liblog \
- libutils \
- libbinder \
- libcutils \
- libhardware \
- libsoundtrigger \
- libaudioclient \
- libmediautils \
-
-# Treble configuration
-LOCAL_SRC_FILES += \
- SoundTriggerHalHidl.cpp
-
-LOCAL_SHARED_LIBRARIES += \
- libhwbinder \
- libhidlbase \
- libhidlmemory \
- libhidltransport \
- libbase \
- libaudiohal \
- libaudiohal_deathhandler \
- android.hardware.soundtrigger@2.0 \
- android.hardware.soundtrigger@2.1 \
- android.hardware.soundtrigger@2.2 \
- android.hardware.audio.common@2.0 \
- android.hidl.allocator@1.0 \
- android.hidl.memory@1.0
-
-
-LOCAL_C_INCLUDES += \
- frameworks/av/services/audioflinger
-
-LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB)
-
-LOCAL_CFLAGS += -Wall -Werror
-
-LOCAL_MODULE:= libsoundtriggerservice
-
-include $(BUILD_SHARED_LIBRARY)