From 34e546088d1631855a9ff786b1e4eef3d38b7152 Mon Sep 17 00:00:00 2001 From: Yuntao Xu Date: Mon, 26 Apr 2021 18:31:14 -0700 Subject: Convert audio/Android.mk to Android.bp Convert the Make file to a Soong one Bug: 186462909 Test: compared the results built by Make and Soong Test: TreeHugger Change-Id: I9ae191e29ea5ef2f3621edfcf5ea26833b90743e --- audio/Android.bp | 45 +++++++++++++++++++++++++++++++++++++++++++++ audio/Android.mk | 41 ----------------------------------------- 2 files changed, 45 insertions(+), 41 deletions(-) create mode 100644 audio/Android.bp delete mode 100644 audio/Android.mk 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...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...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) -- cgit v1.2.3