summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuntao Xu <yuntaoxu@google.com>2021-05-03 18:19:47 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-05-03 18:19:47 +0000
commit9fc3311c1e787b52a1f708f15a2fd12d5f571b09 (patch)
tree3913ab7f9a5e16a3c556650e38b857fda2407344
parentdd5cdb0a5e90ea844c4c22cbdfe13002fe6f3088 (diff)
parent6e99b770742493b86f7de3b12e25fe273367832b (diff)
downloadpoplar-9fc3311c1e787b52a1f708f15a2fd12d5f571b09.tar.gz
Convert audio/Android.mk to Android.bp am: 34e546088d am: fa615eb3ae am: 6e99b77074
Original change: https://android-review.googlesource.com/c/device/linaro/poplar/+/1687410 Change-Id: Ia0d915e03abbc6be0f9bbc4ebf0d2d454a03da01
-rw-r--r--audio/Android.bp45
-rw-r--r--audio/Android.mk41
2 files changed, 45 insertions, 41 deletions
diff --git a/audio/Android.bp b/audio/Android.bp
new file mode 100644
index 0000000..968bab5
--- /dev/null
+++ b/audio/Android.bp
@@ -0,0 +1,45 @@
+// Copyright (C) 2016 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.
+
+// The default audio HAL module, which is a stub, that is loaded if no other
+// device specific modules are present. The exact load order can be seen in
+// libhardware/hardware.c
+//
+// The format of the name is audio.<type>.<hardware/etc>.so where the only
+// required type is 'primary'. Other possibilites are 'a2dp', 'usb', etc.
+
+package {
+ // See: http://go/android-license-faq
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+cc_library_shared {
+ name: "audio.primary.poplar",
+ header_libs: ["libhardware_headers"],
+ relative_install_path: "hw",
+ vendor: true,
+ srcs: ["audio_hw.c"],
+ shared_libs: [
+ "liblog",
+ "libcutils",
+ "libtinyalsa",
+ ],
+ cflags: ["-Wno-unused-parameter"],
+ include_dirs: [
+ "external/tinyalsa/include",
+ "external/expat/lib",
+ "system/media/audio_utils/include",
+ "system/media/audio_effects/include",
+ ],
+}
diff --git a/audio/Android.mk b/audio/Android.mk
deleted file mode 100644
index e97f56d..0000000
--- a/audio/Android.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright (C) 2016 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)
-
-# The default audio HAL module, which is a stub, that is loaded if no other
-# device specific modules are present. The exact load order can be seen in
-# libhardware/hardware.c
-#
-# The format of the name is audio.<type>.<hardware/etc>.so where the only
-# required type is 'primary'. Other possibilites are 'a2dp', 'usb', etc.
-include $(CLEAR_VARS)
-
-LOCAL_HEADER_LIBRARIES += libhardware_headers
-LOCAL_MODULE := audio.primary.poplar
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_MODULE_RELATIVE_PATH := hw
-LOCAL_VENDOR_MODULE := true
-
-LOCAL_SRC_FILES := audio_hw.c
-LOCAL_SHARED_LIBRARIES := liblog libcutils libtinyalsa
-LOCAL_CFLAGS := -Wno-unused-parameter
-LOCAL_C_INCLUDES += \
- external/tinyalsa/include \
- external/expat/lib \
- system/media/audio_utils/include \
- system/media/audio_effects/include
-
-include $(BUILD_SHARED_LIBRARY)