Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Convert android.hardware.soundtrigger@2.0(2.1)-impl to soong" into main am: c808addd20 am: 68bacace68

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3272073

Change-Id: I6db0243a78a1913dd0c49dd2f377fc2094417e88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-10-01 01:24:06 +00:00
committed by Automerger Merge Worker
parent a1c50d971a 68bacace68
commit b911fa80c8
4 changed files with 90 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
soundtrigger/2.0/default/Android.bp
View File

@@ -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",
},
},
}

45
soundtrigger/2.0/default/Android.mk
View File

@@ -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)

57
soundtrigger/2.1/default/Android.bp Normal file
View File

@@ -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",
},
},
}

51
soundtrigger/2.1/default/Android.mk
View File

@@ -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)