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

Commit b5af660f authored by Colin Cross's avatar Colin Cross Committed by Android (Google) Code Review
Browse files

Merge "Convert libsoundpool to Android.bp"

parents 10927c37 98c127f8
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -79,4 +79,5 @@ cc_library_shared {

subdirs = [
    "audioeffect",
    "soundpool",
]
+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)