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

Commit dd780c16 authored by Dan Willemsen's avatar Dan Willemsen Committed by Gerrit Code Review
Browse files

Merge "Convert to Android.bp"

parents 1567662f 442a2ee3

Android.bp

0 → 100644
+4 −0
Original line number Diff line number Diff line 
subdirs = [

    "media/libmedia",

    "media/libstagefright/foundation",

]

media/libmedia/Android.bp

0 → 100644
+10 −0
Original line number Diff line number Diff line 
cc_library_static {

    name: "libmedia_helper",

    srcs: ["AudioParameter.cpp"],

    cflags: [

        "-Werror",

        "-Wno-error=deprecated-declarations",

        "-Wall",

    ],

    clang: true,

}

media/libmedia/Android.mk

+0 −12
Original line number Diff line number Diff line
@@ -2,18 +2,6 @@ LOCAL_PATH:= $(call my-dir) 


include $(CLEAR_VARS)



LOCAL_SRC_FILES:= \

    AudioParameter.cpp

LOCAL_MODULE:= libmedia_helper

LOCAL_MODULE_TAGS := optional



LOCAL_CFLAGS += -Werror -Wno-error=deprecated-declarations -Wall

LOCAL_CLANG := true



include $(BUILD_STATIC_LIBRARY)



include $(CLEAR_VARS)



LOCAL_SRC_FILES:= \

    AudioTrack.cpp \

    AudioTrackShared.cpp \

media/libstagefright/foundation/Android.bp

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

    name: "libstagefright_foundation",



    srcs: [

        "AAtomizer.cpp",

        "ABitReader.cpp",

        "ABuffer.cpp",

        "ADebug.cpp",

        "AHandler.cpp",

        "AHierarchicalStateMachine.cpp",

        "ALooper.cpp",

        "ALooperRoster.cpp",

        "AMessage.cpp",

        "ANetworkSession.cpp",

        "AString.cpp",

        "AStringUtils.cpp",

        "AWakeLock.cpp",

        "ColorUtils.cpp",

        "MediaBuffer.cpp",

        "MediaBufferGroup.cpp",

        "MetaData.cpp",

        "ParsedMessage.cpp",

        "base64.cpp",

        "hexdump.cpp",

    ],



    include_dirs: ["frameworks/av/include/media/stagefright/foundation"],



    shared_libs: [

        "libbinder",

        "libutils",

        "libcutils",

        "liblog",

        "libpowermanager",

    ],



    export_shared_lib_headers: ["libbinder"],



    cflags: [

        "-Wno-multichar",

        "-Werror",

        "-Wall",

    ],

    clang: true,

    sanitize: {

        misc_undefined: [

            "unsigned-integer-overflow",

            "signed-integer-overflow",

        ],

    },

}

media/libstagefright/foundation/Android.mk

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

include $(CLEAR_VARS)



LOCAL_SRC_FILES:=                 \

    AAtomizer.cpp                 \

    ABitReader.cpp                \

    ABuffer.cpp                   \

    ADebug.cpp                    \

    AHandler.cpp                  \

    AHierarchicalStateMachine.cpp \

    ALooper.cpp                   \

    ALooperRoster.cpp             \

    AMessage.cpp                  \

    ANetworkSession.cpp           \

    AString.cpp                   \

    AStringUtils.cpp              \

    AWakeLock.cpp                 \

    ColorUtils.cpp                \

    MediaBuffer.cpp               \

    MediaBufferGroup.cpp          \

    MetaData.cpp                  \

    ParsedMessage.cpp             \

    base64.cpp                    \

    hexdump.cpp



LOCAL_C_INCLUDES:= \

    frameworks/av/include/media/stagefright/foundation



LOCAL_SHARED_LIBRARIES := \

        libbinder         \

        libutils          \

        libcutils         \

        liblog            \

        libpowermanager



LOCAL_EXPORT_SHARED_LIBRARY_HEADERS := libbinder



LOCAL_CFLAGS += -Wno-multichar -Werror -Wall

LOCAL_CLANG := true

LOCAL_SANITIZE := unsigned-integer-overflow signed-integer-overflow



LOCAL_MODULE:= libstagefright_foundation







include $(BUILD_SHARED_LIBRARY)