Merge "Convert android.hardware.soundtrigger@2.0(2.1)-impl to soong" into main (c808addd) · Commits · e / os / android_hardware_interfaces

soundtrigger/2.0/default/Android.bp

+33 −0

Original line number	Diff line number	Diff line
		@@ -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",
		},
		},
		}

deleted100644 → 0

+0 −45

Original line number	Diff line number	Diff line
		#
		# 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)

0 → 100644

+57 −0

Original line number	Diff line number	Diff line
		//
		// 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",
		},
		},
		}

deleted100644 → 0

+0 −51

Original line number	Diff line number	Diff line
		#
		# 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)