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

Commit fcb60f61 authored by Trevor Radcliffe's avatar Trevor Radcliffe Committed by Automerger Merge Worker
Browse files

Merge "Migrate stagefright to Soong" am: e11545cf

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1865634

Change-Id: Ib2452c90be4e045ab96176edebb43ac9e44523dc
parents 47e5bbab e11545cf
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -43,6 +43,10 @@ license {
    ],
}

cc_library_headers {
    name: "camera_headers",
    export_include_dirs: ["include"],
}
cc_library_shared {
    name: "libcamera_client",

+261 −0
Original line number Diff line number Diff line
cc_binary {
    name: "stagefright",

    srcs: [
        "AudioPlayer.cpp",
        "stagefright.cpp",
        "jpeg.cpp",
        "SineSource.cpp",
    ],

    header_libs: [
        "libmediametrics_headers",
        "libstagefright_headers",
    ],

    shared_libs: [
        "libstagefright",
        "libmedia",
        "libmedia_codeclist",
        "libutils",
        "libbinder",
        "libstagefright_foundation",
        "libjpeg",
        "libui",
        "libgui",
        "libcutils",
        "liblog",
        "libhidlbase",
        "libdatasource",
        "libaudioclient",
        "android.hardware.media.omx@1.0",
        "framework-permission-aidl-cpp",
    ],

    static_libs: ["framework-permission-aidl-cpp"],

    cflags: [
        "-Wno-multichar",
    ],

    system_ext_specific: true,
}

cc_binary {
    name: "record",

    srcs: [
        "AudioPlayer.cpp",
        "SineSource.cpp",
        "record.cpp",
    ],

    header_libs: [
        "libmediametrics_headers",
        "libstagefright_headers",
        "camera_headers",
    ],

    shared_libs: [
        "libstagefright",
        "libmedia",
        "liblog",
        "libutils",
        "libbinder",
        "libstagefright_foundation",
        "libdatasource",
        "libaudioclient",
        "framework-permission-aidl-cpp",
    ],

    cflags: [
        "-Wno-multichar",
    ],
}

cc_binary {
    name: "recordvideo",

    srcs: [
        "AudioPlayer.cpp",
        "recordvideo.cpp",
    ],

    header_libs: [
        "libmediametrics_headers",
        "libstagefright_headers",
    ],

    shared_libs: [
        "libstagefright",
        "libmedia",
        "liblog",
        "libutils",
        "libbinder",
        "libstagefright_foundation",
        "libaudioclient",
        "framework-permission-aidl-cpp",
    ],

    cflags: [
        "-Wno-multichar",
    ],
}

cc_binary {
    name: "audioloop",

    srcs: [
        "AudioPlayer.cpp",
        "SineSource.cpp",
        "audioloop.cpp",
    ],

    header_libs: [
        "libmediametrics_headers",
        "libstagefright_headers",
    ],

    shared_libs: [
        "libstagefright",
        "libmedia",
        "liblog",
        "libutils",
        "libbinder",
        "libstagefright_foundation",
        "libaudioclient",
        "framework-permission-aidl-cpp",
    ],

    cflags: [
        "-Wno-multichar",
    ],
}

cc_binary {
    name: "stream",

    srcs: ["stream.cpp"],

    header_libs: [
        "libmediametrics_headers",
        "libstagefright_headers",
    ],

    shared_libs: [
        "libstagefright",
        "liblog",
        "libutils",
        "libbinder",
        "libui",
        "libgui",
        "libstagefright_foundation",
        "libmedia",
        "libcutils",
        "libdatasource",
    ],

    cflags: [
        "-Wno-multichar",
    ],
}

cc_binary {
    name: "codec",

    srcs: [
        "codec.cpp",
        "SimplePlayer.cpp",
    ],

    header_libs: [
        "libmediadrm_headers",
        "libmediametrics_headers",
        "libstagefright_headers",
    ],

    shared_libs: [
        "libstagefright",
        "liblog",
        "libutils",
        "libbinder",
        "libstagefright_foundation",
        "libmedia",
        "libmedia_omx",
        "libaudioclient",
        "libui",
        "libgui",
        "libcutils",
    ],

    cflags: [
        "-Wno-multichar",
    ],
}

cc_binary {
    name: "mediafilter",

    srcs: [
        "filters/argbtorgba.rscript",
        "filters/nightvision.rscript",
        "filters/saturation.rscript",
        "mediafilter.cpp",
    ],

    header_libs: [
        "libmediadrm_headers",
        "libmediametrics_headers",
        "libstagefright_headers",
        "rs-headers",
    ],

    include_dirs: ["frameworks/av/media/libstagefright"],

    shared_libs: [
        "libstagefright",
        "liblog",
        "libutils",
        "libbinder",
        "libstagefright_foundation",
        "libmedia_omx",
        "libui",
        "libgui",
        "libRScpp",
    ],

    static_libs: ["libstagefright_mediafilter"],

    cflags: [
        "-Wno-multichar",
    ],

    sanitize: {
        cfi: true,
    },
}

cc_binary {
    name: "muxer",

    srcs: ["muxer.cpp"],

    header_libs: [
        "libmediametrics_headers",
        "libstagefright_headers",
    ],

    shared_libs: [
        "libstagefright",
        "liblog",
        "libutils",
        "libbinder",
        "libstagefright_foundation",
        "libcutils",
        "libc",
    ],

    cflags: [
        "-Wno-multichar",
    ],
}

cmds/stagefright/Android.mk

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

include $(CLEAR_VARS)

LOCAL_SRC_FILES:=       \
        AudioPlayer.cpp \
        stagefright.cpp \
        jpeg.cpp        \
        SineSource.cpp

LOCAL_HEADER_LIBRARIES := \
        libmediametrics_headers \

LOCAL_SHARED_LIBRARIES := \
        libstagefright libmedia libmedia_codeclist libutils libbinder \
        libstagefright_foundation libjpeg libui libgui libcutils liblog \
        libhidlbase libdatasource libaudioclient \
        android.hardware.media.omx@1.0 \
        framework-permission-aidl-cpp

LOCAL_STATIC_LIBRARIES := framework-permission-aidl-cpp

LOCAL_C_INCLUDES:= \
        frameworks/av/media/libstagefright \
        frameworks/av/media/libstagefright/include \
        frameworks/native/include/media/openmax \

LOCAL_CFLAGS += -Wno-multichar -Werror -Wall

LOCAL_MODULE_TAGS := optional

LOCAL_SYSTEM_EXT_MODULE:= true
LOCAL_MODULE:= stagefright
LOCAL_LICENSE_KINDS:= SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS:= notice
LOCAL_NOTICE_FILE:= $(LOCAL_PATH)/NOTICE

include $(BUILD_EXECUTABLE)

################################################################################

include $(CLEAR_VARS)

LOCAL_SRC_FILES:=         \
        AudioPlayer.cpp \
        SineSource.cpp    \
        record.cpp

LOCAL_HEADER_LIBRARIES := \
        libmediametrics_headers \

LOCAL_SHARED_LIBRARIES := \
        libstagefright libmedia liblog libutils libbinder \
        libstagefright_foundation libdatasource libaudioclient \
        framework-permission-aidl-cpp

LOCAL_C_INCLUDES:= \
        frameworks/av/camera/include \
        frameworks/av/media/libstagefright \
        frameworks/native/include/media/openmax \
        frameworks/native/include/media/hardware

LOCAL_CFLAGS += -Wno-multichar -Werror -Wall

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE:= record
LOCAL_LICENSE_KINDS:= SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS:= notice
LOCAL_NOTICE_FILE:= $(LOCAL_PATH)/NOTICE

include $(BUILD_EXECUTABLE)

################################################################################

include $(CLEAR_VARS)

LOCAL_SRC_FILES:=         \
        AudioPlayer.cpp \
        recordvideo.cpp

LOCAL_HEADER_LIBRARIES := \
        libmediametrics_headers \

LOCAL_SHARED_LIBRARIES := \
        libstagefright libmedia liblog libutils libbinder \
        libstagefright_foundation libaudioclient

LOCAL_C_INCLUDES:= \
        frameworks/av/media/libstagefright \
        frameworks/native/include/media/openmax \
        frameworks/native/include/media/hardware \
        framework-permission-aidl-cpp

LOCAL_CFLAGS += -Wno-multichar -Werror -Wall

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE:= recordvideo
LOCAL_LICENSE_KINDS:= SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS:= notice
LOCAL_NOTICE_FILE:= $(LOCAL_PATH)/NOTICE

include $(BUILD_EXECUTABLE)


################################################################################

include $(CLEAR_VARS)

LOCAL_SRC_FILES:=         \
        AudioPlayer.cpp \
        SineSource.cpp    \
        audioloop.cpp

LOCAL_HEADER_LIBRARIES := \
        libmediametrics_headers \

LOCAL_SHARED_LIBRARIES := \
        libstagefright libmedia liblog libutils libbinder \
        libstagefright_foundation libaudioclient \
        framework-permission-aidl-cpp

LOCAL_C_INCLUDES:= \
        frameworks/av/media/libstagefright \
        frameworks/native/include/media/openmax

LOCAL_CFLAGS += -Wno-multichar -Werror -Wall

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE:= audioloop
LOCAL_LICENSE_KINDS:= SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS:= notice
LOCAL_NOTICE_FILE:= $(LOCAL_PATH)/NOTICE

include $(BUILD_EXECUTABLE)

################################################################################

include $(CLEAR_VARS)

LOCAL_SRC_FILES:=         \
        stream.cpp    \

LOCAL_HEADER_LIBRARIES := \
        libmediametrics_headers \

LOCAL_SHARED_LIBRARIES := \
        libstagefright liblog libutils libbinder libui libgui \
        libstagefright_foundation libmedia libcutils libdatasource

LOCAL_C_INCLUDES:= \
        frameworks/av/media/libstagefright \
        frameworks/native/include/media/openmax

LOCAL_CFLAGS += -Wno-multichar -Werror -Wall

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE:= stream
LOCAL_LICENSE_KINDS:= SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS:= notice
LOCAL_NOTICE_FILE:= $(LOCAL_PATH)/NOTICE

include $(BUILD_EXECUTABLE)

################################################################################

include $(CLEAR_VARS)

LOCAL_SRC_FILES:=               \
        codec.cpp               \
        SimplePlayer.cpp        \

LOCAL_HEADER_LIBRARIES := \
        libmediadrm_headers \
        libmediametrics_headers \

LOCAL_SHARED_LIBRARIES := \
        libstagefright liblog libutils libbinder libstagefright_foundation \
        libmedia libmedia_omx libaudioclient libui libgui libcutils

LOCAL_C_INCLUDES:= \
        frameworks/av/media/libstagefright \
        frameworks/native/include/media/openmax

LOCAL_CFLAGS += -Wno-multichar -Werror -Wall

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE:= codec
LOCAL_LICENSE_KINDS:= SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS:= notice
LOCAL_NOTICE_FILE:= $(LOCAL_PATH)/NOTICE

include $(BUILD_EXECUTABLE)

################################################################################

include $(CLEAR_VARS)

LOCAL_SRC_FILES:= \
        filters/argbtorgba.rscript \
        filters/nightvision.rscript \
        filters/saturation.rscript \
        mediafilter.cpp \

LOCAL_HEADER_LIBRARIES := \
        libmediadrm_headers \
        libmediametrics_headers \

LOCAL_SHARED_LIBRARIES := \
        libstagefright \
        liblog \
        libutils \
        libbinder \
        libstagefright_foundation \
        libmedia_omx \
        libui \
        libgui \
        libRScpp \

LOCAL_C_INCLUDES:= \
        frameworks/av/media/libstagefright \
        frameworks/native/include/media/openmax \
        frameworks/rs/cpp \
        frameworks/rs \

intermediates := $(call intermediates-dir-for,STATIC_LIBRARIES,libRS,TARGET,)
LOCAL_C_INCLUDES += $(intermediates)

LOCAL_STATIC_LIBRARIES:= \
        libstagefright_mediafilter

LOCAL_CFLAGS += -Wno-multichar -Werror -Wall

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE:= mediafilter
LOCAL_LICENSE_KINDS:= SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS:= notice
LOCAL_NOTICE_FILE:= $(LOCAL_PATH)/NOTICE

LOCAL_SANITIZE := cfi

include $(BUILD_EXECUTABLE)

################################################################################

include $(CLEAR_VARS)

LOCAL_SRC_FILES:=               \
        muxer.cpp            \

LOCAL_HEADER_LIBRARIES := \
        libmediametrics_headers \

LOCAL_SHARED_LIBRARIES := \
        libstagefright liblog libutils libbinder libstagefright_foundation \
        libcutils libc

LOCAL_C_INCLUDES:= \
        frameworks/av/media/libstagefright \
        frameworks/native/include/media/openmax

LOCAL_CFLAGS += -Wno-multichar -Werror -Wall

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE:= muxer
LOCAL_LICENSE_KINDS:= SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS:= notice
LOCAL_NOTICE_FILE:= $(LOCAL_PATH)/NOTICE

include $(BUILD_EXECUTABLE)