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

Commit 83e35781 authored by Chong Zhang's avatar Chong Zhang Committed by Automerger Merge Worker
Browse files

Merge "Use NO_IMEMORY version of libstagefright_foundation for apex" into rvc-dev am: 278615a2 

Change-Id: I0cc4f2ca6da37c193c58056d46b755f60d73ebad
parents 40e29feb 278615a2

media/codec2/components/base/Android.bp

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

        "liblog",    // for ALOG

        "libsfplugin_ccodec_utils", // for ImageCopy

        "libstagefright_foundation", // for Mutexed

        "libstagefright_foundation_without_imemory", // for Mutexed

    ],



    target: {

        vendor: {

            exclude_shared_libs: [

                "libstagefright_foundation_without_imemory",

            ],

            shared_libs: [

                "libstagefright_foundation",

            ],

        },

    },



    sanitize: {

        misc_undefined: [

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

        "liblog", // for ALOG

        "libsfplugin_ccodec_utils", // for ImageCopy

        "libstagefright_foundation", // for ColorUtils and MIME

        "libstagefright_foundation_without_imemory", // 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

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

        "libcutils",

        "liblog",

        "libstagefright_foundation",

        "libstagefright_foundation_without_imemory",

        "libutils",

    ],



    target: {

        vendor: {

            exclude_shared_libs: [

                "libstagefright_foundation_without_imemory",

            ],

            shared_libs: [

                "libstagefright_foundation",

            ],

        },

    },



    static_libs: [

        "libyuv_static",

    ],

media/codec2/vndk/Android.bp

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

        "liblog",

        "libnativewindow",

        "libstagefright_foundation",

        "libstagefright_foundation_without_imemory",

        "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

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

        "libhidlmemory",

        "liblog",

        "libstagefright_foundation",

        "libstagefright_foundation_without_imemory",

        "libui",

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


    export_shared_lib_headers: [

        "libhidlmemory",

        "libstagefright_foundation",

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

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

    ],
@@ -68,11 +67,13 @@ 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 __ANDROID_VNDK__

#ifndef NO_IMEMORY

#include <binder/Parcel.h>

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

}



#ifndef __ANDROID_VNDK__

#ifndef NO_IMEMORY

// 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  // __ANDROID_VNDK__

#endif  // NO_IMEMORY



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

    if (other == NULL) {