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

Commit 57060a98 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Use NO_IMEMORY version of libstagefright_foundation for apex""... 

Merge "Revert "Use NO_IMEMORY version of libstagefright_foundation for apex"" into rvc-dev am: 50aff2cd

Change-Id: I68ca2922dc7d1cd7d7d3c466acc43245857144c5
parents 83e35781 50aff2cd

media/codec2/components/base/Android.bp

+2 −24
Original line number Diff line number Diff line
@@ -22,20 +22,9 @@ cc_library_shared { 
        "libcutils", // for properties

        "liblog",    // for ALOG

        "libsfplugin_ccodec_utils", // for ImageCopy

        "libstagefright_foundation_without_imemory", // for Mutexed

        "libstagefright_foundation", // for Mutexed

    ],



    target: {

        vendor: {

            exclude_shared_libs: [

                "libstagefright_foundation_without_imemory",

            ],

            shared_libs: [

                "libstagefright_foundation",

            ],

        },

    },



    sanitize: {

        misc_undefined: [

            "unsigned-integer-overflow",
@@ -68,20 +57,9 @@ cc_defaults { 
        "libcutils", // for properties

        "liblog", // for ALOG

        "libsfplugin_ccodec_utils", // for ImageCopy

        "libstagefright_foundation_without_imemory", // for ColorUtils and MIME

        "libstagefright_foundation", // for ColorUtils and MIME

    ],



    target: {

        vendor: {

            exclude_shared_libs: [

                "libstagefright_foundation_without_imemory",

            ],

            shared_libs: [

                "libstagefright_foundation",

            ],

        },

    },



    cflags: [

        "-Wall",

        "-Werror",

media/codec2/sfplugin/utils/Android.bp

+1 −12
Original line number Diff line number Diff line
@@ -23,20 +23,9 @@ cc_library_shared { 
        "libcodec2_vndk",

        "libcutils",

        "liblog",

        "libstagefright_foundation_without_imemory",

        "libutils",

    ],



    target: {

        vendor: {

            exclude_shared_libs: [

                "libstagefright_foundation_without_imemory",

            ],

            shared_libs: [

        "libstagefright_foundation",

        "libutils",

    ],

        },

    },



    static_libs: [

        "libyuv_static",

media/codec2/vndk/Android.bp

+1 −12
Original line number Diff line number Diff line
@@ -64,23 +64,12 @@ cc_library_shared { 
        "libfmq",

        "liblog",

        "libnativewindow",

        "libstagefright_foundation_without_imemory",

        "libstagefright_foundation",

        "libstagefright_bufferpool@2.0.1",

        "libui",

        "libutils",

    ],



    target: {

        vendor: {

            exclude_shared_libs: [

                "libstagefright_foundation_without_imemory",

            ],

            shared_libs: [

                "libstagefright_foundation",

            ],

        },

    },



    cflags: [

        "-Werror",

        "-Wall",

media/libstagefright/bqhelper/Android.bp

+2 −3
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ cc_defaults { 
        "libhidlbase",

        "libhidlmemory",

        "liblog",

        "libstagefright_foundation_without_imemory",

        "libstagefright_foundation",

        "libui",

        "libutils",
@@ -35,6 +35,7 @@ cc_defaults { 


    export_shared_lib_headers: [

        "libhidlmemory",

        "libstagefright_foundation",

        "android.hardware.graphics.bufferqueue@1.0",

        "android.hardware.graphics.bufferqueue@2.0",

    ],
@@ -67,13 +68,11 @@ cc_library_shared { 
        vendor: {

            exclude_shared_libs: [

                "libgui",

                "libstagefright_foundation_without_imemory",

            ],

            static_libs: [

                "libgui_bufferqueue_static",

            ],

            shared_libs: [

                "libstagefright_foundation",

                "android.hidl.token@1.0-utils",

                "libEGL",

                "libnativewindow",

media/libstagefright/foundation/AMessage.cpp

+3 −3
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 


#include <media/stagefright/foundation/hexdump.h>



#ifndef NO_IMEMORY

#ifndef __ANDROID_VNDK__

#include <binder/Parcel.h>

#endif
@@ -646,7 +646,7 @@ AString AMessage::debugString(int32_t indent) const { 
    return s;

}



#ifndef NO_IMEMORY

#ifndef __ANDROID_VNDK__

// static

sp<AMessage> AMessage::FromParcel(const Parcel &parcel, size_t maxNestingLevel) {

    int32_t what = parcel.readInt32();
@@ -813,7 +813,7 @@ void AMessage::writeToParcel(Parcel *parcel) const { 
        }

    }

}

#endif  // NO_IMEMORY

#endif  // __ANDROID_VNDK__



sp<AMessage> AMessage::changesFrom(const sp<const AMessage> &other, bool deep) const {

    if (other == NULL) {