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

Commit 738cf427 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

release-request-e32f3567-b299-4433-aaca-18a62b3f00c0-for-git_oc-dr1-release-39... 

release-request-e32f3567-b299-4433-aaca-18a62b3f00c0-for-git_oc-dr1-release-3964195 snap-temp-L52500000059616409

Change-Id: If76eb62ed1687a6ea034b5fee38197994635917f
parents 80fe8961 4b8bedb8

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ ndk_headers { 


subdirs = [

    "camera",

    "drm/*",

    "media/*",

    "radio",

    "soundtrigger",

CleanSpec.mk

+6 −0
Original line number Diff line number Diff line
@@ -70,6 +70,12 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/init/mediacodec.rc) 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/libeffects.so)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib64/libeffects.so)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libeffects_intermediates)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/soundfx/libeffectproxy.so)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/soundfx/libldnhncr.so)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/soundfx/libdownmix.so)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/soundfx/libvisualizer.so)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/soundfx/libreverbwrapper.so)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/soundfx/libbundlewrapper.so)



# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

cmds/stagefright/stagefright.cpp

+9 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ static void dumpSource(const sp<IMediaSource> &source, const String8 &filename) 
                       1,

                       mbuf->range_length(),

                       out),

                (ssize_t)mbuf->range_length());

                mbuf->range_length());



        mbuf->release();

        mbuf = NULL;
@@ -1048,6 +1048,10 @@ int main(int argc, char **argv) { 
                bool haveVideo = false;

                for (size_t i = 0; i < numTracks; ++i) {

                    sp<IMediaSource> source = extractor->getTrack(i);

                    if (source == nullptr) {

                        fprintf(stderr, "skip NULL track %zu, track count %zu.\n", i, numTracks);

                        continue;

                    }



                    const char *mime;

                    CHECK(source->getFormat()->findCString(
@@ -1110,6 +1114,10 @@ int main(int argc, char **argv) { 
                }



                mediaSource = extractor->getTrack(i);

                if (mediaSource == nullptr) {

                    fprintf(stderr, "skip NULL track %zu, total tracks %zu.\n", i, numTracks);

                    return -1;

                }

            }

        }

cmds/stagefright/stream.cpp

+8 −2
Original line number Diff line number Diff line
@@ -171,7 +171,8 @@ MyConvertingStreamSource::MyConvertingStreamSource(const char *filename) 
    mWriter = new MPEG2TSWriter(

            this, &MyConvertingStreamSource::WriteDataWrapper);



    for (size_t i = 0; i < extractor->countTracks(); ++i) {

    size_t numTracks = extractor->countTracks();

    for (size_t i = 0; i < numTracks; ++i) {

        const sp<MetaData> &meta = extractor->getTrackMetaData(i);



        const char *mime;
@@ -181,7 +182,12 @@ MyConvertingStreamSource::MyConvertingStreamSource(const char *filename) 
            continue;

        }



        CHECK_EQ(mWriter->addSource(extractor->getTrack(i)), (status_t)OK);

        sp<IMediaSource> track = extractor->getTrack(i);

        if (track == nullptr) {

            fprintf(stderr, "skip NULL track %zu, total tracks %zu\n", i, numTracks);

            continue;

        }

        CHECK_EQ(mWriter->addSource(track), (status_t)OK);

    }



    CHECK_EQ(mWriter->start(), (status_t)OK);

drm/libmediadrm/Android.bp

0 → 100644
+52 −0
Original line number Diff line number Diff line 
//

// libmediadrm

//



cc_library_shared {

    name: "libmediadrm",



    aidl: {

        local_include_dirs: ["aidl"],

        export_aidl_headers: true,

    },



    srcs: [

        "aidl/android/media/ICas.aidl",

        "aidl/android/media/ICasListener.aidl",

        "aidl/android/media/IDescrambler.aidl",

        "aidl/android/media/IMediaCasService.aidl",



        "CasImpl.cpp",

        "DescramblerImpl.cpp",

        "DrmPluginPath.cpp",

        "DrmSessionManager.cpp",

        "ICrypto.cpp",

        "IDrm.cpp",

        "IDrmClient.cpp",

        "IMediaDrmService.cpp",

        "MediaCasDefs.cpp",

        "SharedLibrary.cpp",

        "DrmHal.cpp",

        "CryptoHal.cpp",

    ],



    shared_libs: [

        "libbinder",

        "libcutils",

        "libdl",

        "liblog",

        "libmediautils",

        "libstagefright_foundation",

        "libutils",

        "android.hidl.base@1.0",

        "android.hardware.drm@1.0",

        "libhidlbase",

        "libhidlmemory",

        "libhidltransport",

    ],



    cflags: [

        "-Werror",

        "-Wall",

    ],

}