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

Commit c2ed729e authored by Steven Moreland's avatar Steven Moreland
Browse files

audio.common@2.0-util: vendor_available + in Soong 

vendor_available: separate copy built on the vendor partition for
BOARD_VNDK_VERSION := current devices.

**************************************************
See full implications + warning on:
https://android-review.googlesource.com/#/c/369995/

(Ia4eb5378d941033b07673daf682e66051cd3c075)
***************************************************

Test: (sanity) audio works on internal marlin
Test: (sanity) hangouts call on internal marlin
Test: warnings don't show up on BOARD_VNDK_VERSION := current devices.
Bug: 33241851

Change-Id: I2de1b789a44d238e31108312b4ec0dd5d404b1e6
parent 586fd648

audio/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -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",

]

audio/common/2.0/default/Android.bp

0 → 100644
+32 −0
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.



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

    ],



}

audio/common/2.0/default/Android.mk

deleted100644 → 0
+0 −32
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.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)