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

Commit 9fc83c5c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move xmlparser to under libstagefright"

parents ad8ea963 2be091ce

CleanSpec.mk

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/soundfx/libreverbwrapper 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/soundfx/libbundlewrapper.so)

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

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

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/libstagefright_xmlparser@1.0.so)



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

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

media/libmedia/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ cc_defaults { 
    ],



    include_dirs: [

        "frameworks/av/include", // for media/vndk/xmlparser/1.0/MediaCodecsXmlParser.h

        "frameworks/av/include/media",

        "frameworks/native/include", // for media/hardware/MetadataBufferType.h

        "frameworks/native/include/media/openmax",

media/libstagefright/Android.bp

+2 −1
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ cc_library_shared { 
        "libmedia_helper",

        "libstagefright_flacdec",

        "libstagefright_foundation",

        "libstagefright_xmlparser",

        "libdl",

        "libRScpp",

        "libhidlbase",
@@ -109,7 +110,6 @@ cc_library_shared { 
        "android.hardware.cas@1.0",

        "android.hardware.cas.native@1.0",

        "android.hardware.media.omx@1.0",

        "libstagefright_xmlparser@1.0",

    ],



    static_libs: [
@@ -177,4 +177,5 @@ subdirs = [ 
    "timedtext",

    "webm",

    "wifi-display",

    "xmlparser",

]

media/libstagefright/include/OMX.h

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include <media/IOMX.h>

#include <utils/threads.h>

#include <utils/KeyedVector.h>

#include <media/vndk/xmlparser/1.0/MediaCodecsXmlParser.h>

#include <media/stagefright/xmlparser/MediaCodecsXmlParser.h>

#include "OmxNodeOwner.h"



namespace android {

media/libstagefright/omx/1.0/Omx.h

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include "../../include/OMXNodeInstance.h"



#include <android/hardware/media/omx/1.0/IOmx.h>

#include <media/vndk/xmlparser/1.0/MediaCodecsXmlParser.h>

#include <media/stagefright/xmlparser/MediaCodecsXmlParser.h>



namespace android {