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

Commit 0bd45d3f authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Convert libsoundpool to Android.bp" am: dde9ee9e am: e9ffa404 

am: 13ea256d

Change-Id: I8af55458b0bba29701249f7a8165f30055262f46
parents b5c21e85 13ea256d

media/jni/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -79,4 +79,5 @@ cc_library_shared { 


subdirs = [

    "audioeffect",

    "soundpool",

]

media/jni/soundpool/Android.bp

0 → 100644
+28 −0
Original line number Diff line number Diff line 
cc_library_shared {

    name: "libsoundpool",



    srcs: [

        "android_media_SoundPool.cpp",

        "SoundPool.cpp",

        "SoundPoolThread.cpp",

    ],



    shared_libs: [

        "liblog",

        "libcutils",

        "libutils",

        "libandroid_runtime",

        "libnativehelper",

        "libaudioclient",

        "libmediandk",

        "libbinder",

    ],



    cflags: [

        "-Wall",

        "-Werror",

        "-Wno-error=deprecated-declarations",

        "-Wunused",

        "-Wunreachable-code",

    ],

}

media/jni/soundpool/Android.mk

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

include $(CLEAR_VARS)



LOCAL_SRC_FILES:= \

    android_media_SoundPool.cpp \

    SoundPool.cpp \

    SoundPoolThread.cpp



LOCAL_SHARED_LIBRARIES := \

    liblog \

    libcutils \

    libutils \

    libandroid_runtime \

    libnativehelper \

    libaudioclient \

    libmediandk \

    libbinder



LOCAL_MODULE:= libsoundpool



LOCAL_CFLAGS += -Wall -Werror -Wno-error=deprecated-declarations -Wunused -Wunreachable-code



include $(BUILD_SHARED_LIBRARY)