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

Commit 39785597 authored by Mikhail Naganov's avatar Mikhail Naganov Committed by android-build-merger
Browse files

Merge "libnbaio: Add libaudioutils headers export" am: 595bb9f7 am: 4512298d am: 63923498 

am: 6ab3c15c

Change-Id: I5edf96f3adaafdfafdd45130e92bde47e0bb0745
parents 022afb0a 6ab3c15c

media/audioserver/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ LOCAL_C_INCLUDES := \ 
	frameworks/av/media/libaaudio/src \

	frameworks/av/media/libaaudio/src/binding \

	frameworks/av/media/libmedia \

	$(call include-path-for, audio-utils) \

	external/sonic \



# If AUDIOSERVER_MULTILIB in device.mk is non-empty then it is used to control

media/libnbaio/Android.bp

+3 −3
Original line number Diff line number Diff line 


cc_defaults {

    name: "libnbaio_mono_defaults",

    srcs: [
@@ -21,6 +20,9 @@ cc_defaults { 
        "liblog",

        "libutils",

    ],

    export_shared_lib_headers: [

        "libaudioutils",

    ],



    export_include_dirs: ["include_mono"],

}
@@ -66,7 +68,5 @@ cc_library_shared { 
        "-Wall",

    ],



    include_dirs: ["system/media/audio_utils/include"],



    export_include_dirs: ["include"],

}