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

Commit 4735f4d7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "libstagefright_foundation_defaults: Add host support" am: 81ad94b0 am: d061735e 

Change-Id: Iad50adb132ff601e1a743dbd8a54bbb167314dd1
parents 088f0223 d061735e

media/libstagefright/foundation/ALooperRoster.cpp

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ void ALooperRoster::dump(int fd, const Vector<String16>& args) { 
        }

        s.append("\n");

    }

    write(fd, s.string(), s.size());

    (void)write(fd, s.string(), s.size());

}



}  // namespace android

media/libstagefright/foundation/AString.cpp

+5 −1
Original line number Diff line number Diff line
@@ -387,10 +387,14 @@ AString AStringPrintf(const char *format, ...) { 
    va_start(ap, format);



    char *buffer;

    vasprintf(&buffer, format, ap);

    int bufferSize = vasprintf(&buffer, format, ap);



    va_end(ap);



    if(bufferSize < 0) {

        return AString();

    }



    AString result(buffer);



    free(buffer);

media/libstagefright/foundation/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ cc_defaults { 
    vndk: {

        enabled: true,

    },

    host_supported: true,

    double_loadable: true,

    include_dirs: [

        "frameworks/av/include",
@@ -85,6 +86,9 @@ cc_defaults { 
                "-DNO_IMEMORY",

            ],

        },

        darwin: {

            enabled: false,

        },

    },



    clang: true,