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

Commit d49bb43c authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge "audio hal: explicitly import headers" into oc-dev am: 41c639f7 

am: a423b194

Change-Id: I7b054f2f74bd8a1f5ae56d1616e5f3788ccca691
parents 2c459904 a423b194

audio/2.0/default/Android.mk

+6 −0
Original line number Original line Diff line number Diff line
@@ -43,6 +43,12 @@ LOCAL_SHARED_LIBRARIES := \ 
    android.hardware.audio.common@2.0 \

    android.hardware.audio.common@2.0 \

    android.hardware.audio.common@2.0-util \

    android.hardware.audio.common@2.0-util \





LOCAL_HEADER_LIBRARIES := \

    libaudioclient_headers \

    libaudio_system_headers \

    libhardware_headers \

    libmedia_headers \



LOCAL_WHOLE_STATIC_LIBRARIES := libmedia_helper

LOCAL_WHOLE_STATIC_LIBRARIES := libmedia_helper





include $(BUILD_SHARED_LIBRARY)

include $(BUILD_SHARED_LIBRARY)

audio/common/2.0/default/Android.bp

+5 −0
Original line number Original line Diff line number Diff line
@@ -24,9 +24,14 @@ cc_library_shared { 
    export_include_dirs: ["."],

    export_include_dirs: ["."],





    shared_libs: [

    shared_libs: [

        "liblog",

        "libutils",

        "libutils",

        "libhidlbase",

        "libhidlbase",

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

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

    ],

    ],





    header_libs: [

        "libaudio_system_headers",

        "libhardware_headers",

    ],

}
 
}

audio/effect/2.0/default/Android.mk

+7 −0
Original line number Original line Diff line number Diff line
@@ -36,4 +36,11 @@ LOCAL_SHARED_LIBRARIES := \ 
    android.hardware.audio.effect@2.0 \

    android.hardware.audio.effect@2.0 \

    android.hidl.memory@1.0 \

    android.hidl.memory@1.0 \





LOCAL_HEADER_LIBRARIES := \

    libaudio_system_headers \

    libaudioclient_headers \

    libeffects_headers \

    libhardware_headers \

    libmedia_headers \



include $(BUILD_SHARED_LIBRARY)
 
include $(BUILD_SHARED_LIBRARY)