Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad22189d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes Iab4d397d,Ie38dd261,Ibec647f1,I5f5cbb59,I01c0c867

* changes:
  soundtrigger: Add VTS tests for v2.1
  soundtrigger: Default implementation for version 2.1
  soundtrigger: Refactor the default implementation to be extensible
  soundtrigger: Apply clang-format to 2.0 default implementation
  soundtrigger: Define v2.1 HAL
parents 759987d9 dd49a1b1
Loading
Loading
Loading
Loading
+43 −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.

cc_library_shared {
    name: "android.hardware.soundtrigger@2.0-core",
    defaults: ["hidl_defaults"],
    vendor_available: true,
    vndk: {
        enabled: true,
    },
    srcs: [
        "SoundTriggerHalImpl.cpp",
    ],

    export_include_dirs: ["."],

    shared_libs: [
        "libhidlbase",
        "libhidltransport",
        "liblog",
        "libutils",
        "libhardware",
        "android.hardware.soundtrigger@2.0",
        "android.hardware.audio.common@2.0",
    ],

    header_libs: [
        "libaudio_system_headers",
        "libhardware_headers",
    ],
}
+5 −8
Original line number Diff line number Diff line
@@ -18,23 +18,20 @@ LOCAL_PATH := $(call my-dir)

include $(CLEAR_VARS)
LOCAL_MODULE := android.hardware.soundtrigger@2.0-impl
LOCAL_PROPRIETARY_MODULE := true
LOCAL_VENDOR_MODULE := true
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_SRC_FILES := \
    SoundTriggerHalImpl.cpp
    FetchISoundTriggerHw.cpp

LOCAL_CFLAGS := -Wall -Werror

LOCAL_SHARED_LIBRARIES := \
        libhidlbase \
        libhidltransport \
        liblog \
        libutils \
        libhardware \
        libutils \
        android.hardware.soundtrigger@2.0 \
        android.hardware.audio.common@2.0
        android.hardware.soundtrigger@2.0-core

LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
LOCAL_C_INCLUDE_DIRS := $(LOCAL_PATH)

ifeq ($(strip $(AUDIOSERVER_MULTILIB)),)
LOCAL_MULTILIB := 32
+23 −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.
 */

#include "SoundTriggerHalImpl.h"

extern "C" ::android::hardware::soundtrigger::V2_0::ISoundTriggerHw* HIDL_FETCH_ISoundTriggerHw(
    const char* /* name */) {
    return (new ::android::hardware::soundtrigger::V2_0::implementation::SoundTriggerHalImpl())
        ->getInterface();
}
+139 −206

File changed.

Preview size limit exceeded, changes collapsed.

+132 −85

File changed.

Preview size limit exceeded, changes collapsed.

Loading