From 9e51418fc6cdd1556078348fb7954aca820c3ada Mon Sep 17 00:00:00 2001 From: Bill Yang Date: Fri, 20 Sep 2024 02:53:03 +0000 Subject: [PATCH] Convert android.hardware.soundtrigger@2.0(2.1)-impl to soong Bug: 368214360 Test: lunch aosp_cheetah-trunk_staging-userdebug; \ m android.hardware.soundtrigger@2.0-impl \ android.hardware.soundtrigger@2.1-impl Test: lunch aosp_cf_x86_64_only_phone-trunk_staging-userdebug; \ m android.hardware.soundtrigger@2.0-impl \ android.hardware.soundtrigger@2.1-impl Change-Id: Ie5f1efac9073a8b61e72e08ce1b3267417594c96 --- soundtrigger/2.0/default/Android.bp | 33 +++++++++++++++++ soundtrigger/2.0/default/Android.mk | 45 ----------------------- soundtrigger/2.1/default/Android.bp | 57 +++++++++++++++++++++++++++++ soundtrigger/2.1/default/Android.mk | 51 -------------------------- 4 files changed, 90 insertions(+), 96 deletions(-) delete mode 100644 soundtrigger/2.0/default/Android.mk create mode 100644 soundtrigger/2.1/default/Android.bp delete mode 100644 soundtrigger/2.1/default/Android.mk diff --git a/soundtrigger/2.0/default/Android.bp b/soundtrigger/2.0/default/Android.bp index 2cbf0416f0..2e61f9b1c3 100644 --- a/soundtrigger/2.0/default/Android.bp +++ b/soundtrigger/2.0/default/Android.bp @@ -46,3 +46,36 @@ cc_library_shared { "libhardware_headers", ], } + +soong_config_module_type { + name: "soundtrigger_cc_library_shared", + module_type: "cc_library_shared", + config_namespace: "soundtrigger", + value_variables: [ + "audioserver_multilib", + ], + properties: ["compile_multilib"], +} + +soundtrigger_cc_library_shared { + name: "android.hardware.soundtrigger@2.0-impl", + vendor: true, + relative_install_path: "hw", + srcs: ["FetchISoundTriggerHw.cpp"], + cflags: [ + "-Wall", + "-Werror", + ], + shared_libs: [ + "libhardware", + "libutils", + "android.hardware.soundtrigger@2.0", + "android.hardware.soundtrigger@2.0-core", + ], + compile_multilib: "32", + soong_config_variables: { + audioserver_multilib: { + compile_multilib: "%s", + }, + }, +} diff --git a/soundtrigger/2.0/default/Android.mk b/soundtrigger/2.0/default/Android.mk deleted file mode 100644 index 17e44403c0..0000000000 --- a/soundtrigger/2.0/default/Android.mk +++ /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. - - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.soundtrigger@2.0-impl -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../NOTICE -LOCAL_VENDOR_MODULE := true -LOCAL_MODULE_RELATIVE_PATH := hw -LOCAL_SRC_FILES := \ - FetchISoundTriggerHw.cpp - -LOCAL_CFLAGS := -Wall -Werror - -LOCAL_SHARED_LIBRARIES := \ - libhardware \ - libutils \ - android.hardware.soundtrigger@2.0 \ - android.hardware.soundtrigger@2.0-core - -LOCAL_C_INCLUDE_DIRS := $(LOCAL_PATH) - -ifeq ($(strip $(AUDIOSERVER_MULTILIB)),) -LOCAL_MULTILIB := 32 -else -LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB) -endif - -include $(BUILD_SHARED_LIBRARY) diff --git a/soundtrigger/2.1/default/Android.bp b/soundtrigger/2.1/default/Android.bp new file mode 100644 index 0000000000..a246680dfe --- /dev/null +++ b/soundtrigger/2.1/default/Android.bp @@ -0,0 +1,57 @@ +// +// Copyright (C) 2018 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. + +package { + // See: http://go/android-license-faq + default_applicable_licenses: [ + "hardware_interfaces_license", + ], +} + +soong_config_module_type_import { + from: "hardware/interfaces/soundtrigger/2.0/default/Android.bp", + module_types: ["soundtrigger_cc_library_shared"], +} + +soundtrigger_cc_library_shared { + name: "android.hardware.soundtrigger@2.1-impl", + vendor: true, + relative_install_path: "hw", + srcs: ["SoundTriggerHw.cpp"], + + cflags: [ + "-Wall", + "-Werror", + ], + + shared_libs: [ + "libhardware", + "libhidlbase", + "libhidlmemory", + "liblog", + "libutils", + "android.hardware.soundtrigger@2.1", + "android.hardware.soundtrigger@2.0", + "android.hardware.soundtrigger@2.0-core", + "android.hidl.allocator@1.0", + "android.hidl.memory@1.0", + ], + compile_multilib: "32", + soong_config_variables: { + audioserver_multilib: { + compile_multilib: "%s", + }, + }, +} diff --git a/soundtrigger/2.1/default/Android.mk b/soundtrigger/2.1/default/Android.mk deleted file mode 100644 index 602f5a7130..0000000000 --- a/soundtrigger/2.1/default/Android.mk +++ /dev/null @@ -1,51 +0,0 @@ -# -# Copyright (C) 2018 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_MODULE := android.hardware.soundtrigger@2.1-impl -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../NOTICE -LOCAL_VENDOR_MODULE := true -LOCAL_MODULE_RELATIVE_PATH := hw -LOCAL_SRC_FILES := \ - SoundTriggerHw.cpp - -LOCAL_CFLAGS := -Wall -Werror - -LOCAL_SHARED_LIBRARIES := \ - libhardware \ - libhidlbase \ - libhidlmemory \ - liblog \ - libutils \ - android.hardware.soundtrigger@2.1 \ - android.hardware.soundtrigger@2.0 \ - android.hardware.soundtrigger@2.0-core \ - android.hidl.allocator@1.0 \ - android.hidl.memory@1.0 - -LOCAL_C_INCLUDE_DIRS := $(LOCAL_PATH) - -ifeq ($(strip $(AUDIOSERVER_MULTILIB)),) -LOCAL_MULTILIB := 32 -else -LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB) -endif - -include $(BUILD_SHARED_LIBRARY)