Merge "audio.common@2.0-util: vendor_available + in Soong" into oc-dev

This commit is contained in:
TreeHugger Robot
2017-04-14 04:00:09 +00:00
committed by Android (Google) Code Review
3 changed files with 33 additions and 32 deletions

View File

@@ -3,6 +3,7 @@ subdirs = [
"2.0",
"2.0/vts/functional",
"common/2.0",
"common/2.0/default",
"effect/2.0",
"effect/2.0/vts/functional",
]

View File

@@ -0,0 +1,32 @@
//
// 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.
cc_library_shared {
name: "android.hardware.audio.common@2.0-util",
vendor_available: true,
srcs: [
"EffectMap.cpp",
"HidlUtils.cpp",
],
export_include_dirs: ["."],
shared_libs: [
"libutils",
"libhidlbase",
"android.hardware.audio.common@2.0",
],
}

View File

@@ -1,32 +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.audio.common@2.0-util
LOCAL_SRC_FILES := \
EffectMap.cpp \
HidlUtils.cpp \
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
LOCAL_SHARED_LIBRARIES := \
libutils \
libhidlbase \
android.hardware.audio.common@2.0 \
include $(BUILD_SHARED_LIBRARY)