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

Commit 88e8f90e authored by Kevin Rocard's avatar Kevin Rocard
Browse files

Audio VTS: Test now use Android.mk 



To validate the audio_policy_configuration.xml against a schema,
libxml2 is used.
Unfortunately, libxml2 uses Android.mk in oc-dev thus can not be used
from the tests which uses Android.bp.

It has been deemed safer to transform the tests to use Android.mk rather
than backporting the Android.bp patch from master.

Test: Compile
Bug: 35700978
Merged-In: I800e692a6ff4f64655007c33af7e34d879ee1132
Change-Id: Ie3f2069d60be369b4c37c27e9c1cf9372323a19c
Signed-off-by: default avatarKevin Rocard <krocard@google.com>
parent 5abb15e9

audio/2.0/vts/Android.mk

0 → 100644
+3 −0
Original line number Diff line number Diff line 
LOCAL_PATH := $(call my-dir)



include $(call all-makefiles-under,$(LOCAL_PATH))

audio/2.0/vts/functional/Android.bp

deleted100644 → 0
+0 −39
Original line number Diff line number Diff line 
//

// Copyright (C) 2017 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_test {

    name: "VtsHalAudioV2_0TargetTest",

    defaults: ["hidl_defaults"],

    srcs: ["AudioPrimaryHidlHalTest.cpp"],

    shared_libs: [

        "libbase",

        "liblog",

        "libhidlbase",

        "libhidltransport",

        "libutils",

        "libcutils",

        "android.hardware.audio@2.0",

        "android.hardware.audio.common@2.0",

    ],

    static_libs: ["VtsHalHidlTargetTestBase"],

    cflags: [

        "-O0",

        "-g",

        "-Wall",

        "-Wextra",

        "-Werror",

    ],

}

audio/2.0/vts/functional/Android.mk

0 → 100644
+40 −0
Original line number Diff line number Diff line 
# Copyright (C) 2017 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_CLANG := true

LOCAL_MODULE := VtsHalAudioV2_0TargetTest

LOCAL_CPPFLAGS := -O0 -g -Wall -Wextra -Werror

LOCAL_SRC_FILES := \

    AudioPrimaryHidlHalTest.cpp \



LOCAL_C_INCLUDES := external/libxml2/include



LOCAL_STATIC_LIBRARIES := VtsHalHidlTargetTestBase

LOCAL_SHARED_LIBRARIES := \

    libbase \

    liblog \

    libhidlbase \

    libhidltransport \

    libutils \

    libcutils \

    libxml2 \

    libicuuc \

    android.hardware.audio@2.0 \

    android.hardware.audio.common@2.0 \



include $(BUILD_NATIVE_TEST)

audio/Android.bp

+0 −1
Original line number Diff line number Diff line 
// This is an autogenerated file, do not edit.

subdirs = [

    "2.0",

    "2.0/vts/functional",

    "common/2.0",

    "common/2.0/default",

    "effect/2.0",