Revert "Convert audio/Android.mk to Android.bp" am: 455e2814ef am: 83ed7e6fb0 am: 10a0eece36 am: eee0d8c1ffandroid-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-release

Original change: https://android-review.googlesource.com/c/device/linaro/poplar/+/1697525

Change-Id: I5b58fdd83240d1d959cb45e55fc5fdbca42127a0

2 files changed, 41 insertions, 45 deletions

diff --git a/audio/Android.bp b/audio/Android.bp
deleted file mode 100644
index 968bab5..0000000
--- a/audio/Android.bp
+++ /dev/null
@@ -1,45 +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.
-
-// 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
new file mode 100644
index 0000000..e97f56d
--- /dev/null
+++ b/audio/Android.mk
@@ -0,0 +1,41 @@
+# 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)