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

Commit 2f89ec29 authored by Chong Zhang's avatar Chong Zhang
Browse files

Set use_vendor to false for media apex 

Use __ANDROID_APEX__ macro to define out binder dependencies in
libstagefright_foundation for apex, and exclude libbinder shared lib.

bug: 166468760
Change-Id: If016c8f22bc4d240a68ff5737f74b460fac1974e
parent 5e883d13

apex/Android.bp

+0 −1
Original line number Original line Diff line number Diff line
@@ -97,7 +97,6 @@ apex_defaults { 
        "crash_dump.policy",

        "crash_dump.policy",

        "mediaswcodec.xml",

        "mediaswcodec.xml",

    ],

    ],

    use_vendor: true,

    key: "com.android.media.swcodec.key",

    key: "com.android.media.swcodec.key",

    certificate: ":com.android.media.swcodec.certificate",

    certificate: ":com.android.media.swcodec.certificate",

media/codecs/g711/decoder/Android.bp

+7 −1
Original line number Original line Diff line number Diff line
@@ -35,7 +35,13 @@ cc_library_static { 
        ],

        ],

        cfi: true,

        cfi: true,

    },

    },

    apex_available: ["com.android.media.swcodec"],



    apex_available: [

        "//apex_available:platform",

        "com.android.media.swcodec",

        "test_com.android.media.swcodec",

    ],



    min_sdk_version: "29",

    min_sdk_version: "29",





    target: {

    target: {

media/libstagefright/bqhelper/Android.bp

+1 −0
Original line number Original line Diff line number Diff line
@@ -101,6 +101,7 @@ cc_library_shared { 
        "//apex_available:platform",

        "//apex_available:platform",

    ],

    ],

    vendor_available: false,

    vendor_available: false,

    min_sdk_version: "29",

    static_libs: [

    static_libs: [

        "libgui_bufferqueue_static",

        "libgui_bufferqueue_static",

    ],

    ],

media/libstagefright/foundation/AMessage.cpp

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




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

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





#ifndef __ANDROID_VNDK__

#if !defined(__ANDROID_VNDK__) && !defined(__ANDROID_APEX__)

#include <binder/Parcel.h>

#include <binder/Parcel.h>

#endif

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

    return s;

}

}





#ifndef __ANDROID_VNDK__

#if !defined(__ANDROID_VNDK__) && !defined(__ANDROID_APEX__)

// static

// static

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

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

    int32_t what = parcel.readInt32();

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

        }

    }

    }

}

}

#endif  // __ANDROID_VNDK__

#endif  // !defined(__ANDROID_VNDK__) && !defined(__ANDROID_APEX__)





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

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

    if (other == NULL) {

    if (other == NULL) {

media/libstagefright/foundation/AString.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include "ADebug.h"

#include "ADebug.h"

#include "AString.h"

#include "AString.h"





#ifndef __ANDROID_VNDK__

#if !defined(__ANDROID_VNDK__) && !defined(__ANDROID_APEX__)

#include <binder/Parcel.h>

#include <binder/Parcel.h>

#endif

#endif
@@ -365,7 +365,7 @@ bool AString::endsWithIgnoreCase(const char *suffix) const { 
    return !strcasecmp(mData + mSize - suffixLen, suffix);

    return !strcasecmp(mData + mSize - suffixLen, suffix);

}

}





#ifndef __ANDROID_VNDK__

#if !defined(__ANDROID_VNDK__) && !defined(__ANDROID_APEX__)

// static

// static

AString AString::FromParcel(const Parcel &parcel) {

AString AString::FromParcel(const Parcel &parcel) {

    size_t size = static_cast<size_t>(parcel.readInt32());

    size_t size = static_cast<size_t>(parcel.readInt32());
@@ -380,7 +380,7 @@ status_t AString::writeToParcel(Parcel *parcel) const { 
    }

    }

    return err;

    return err;

}

}

#endif

#endif // !defined(__ANDROID_VNDK__) && !defined(__ANDROID_APEX__)





AString AStringPrintf(const char *format, ...) {

AString AStringPrintf(const char *format, ...) {

    va_list ap;

    va_list ap;