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

Commit b62e77b1 authored by Ray Essick's avatar Ray Essick Committed by android-build-merger
Browse files

Merge "Move MediaMetrics into its own library" into oc-dev am: c668efcf 

am: a85c7351

Change-Id: Ie7fb351c752fcbfdf6690c15d62c7c754b166213
parents 85a33cf9 a85c7351

include/media/IMediaAnalyticsService.h

+1 −1
Original line number Diff line number Diff line 
../../media/libmedia/include/IMediaAnalyticsService.h
 
 No newline at end of file
 
../../media/libmediametrics/include/IMediaAnalyticsService.h
 
 No newline at end of file

include/media/MediaAnalyticsItem.h

+1 −1
Original line number Diff line number Diff line 
../../media/libmedia/include/MediaAnalyticsItem.h
 
 No newline at end of file
 
../../media/libmediametrics/include/MediaAnalyticsItem.h
 
 No newline at end of file

media/libmedia/Android.mk

+1 −2
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ LOCAL_SRC_FILES += \ 
    IMediaPlayer.cpp \

    IMediaRecorder.cpp \

    IMediaSource.cpp \

    IMediaAnalyticsService.cpp \

    IRemoteDisplay.cpp \

    IRemoteDisplayClient.cpp \

    IResourceManagerClient.cpp \
@@ -35,7 +34,6 @@ LOCAL_SRC_FILES += \ 
    MediaCodecBuffer.cpp \

    MediaCodecInfo.cpp \

    MediaDefs.cpp \

    MediaAnalyticsItem.cpp \

    MediaUtils.cpp \

    Metadata.cpp \

    mediarecorder.cpp \
@@ -66,6 +64,7 @@ LOCAL_SHARED_LIBRARIES := \ 
        libcamera_client libstagefright_foundation \

        libgui libdl libaudioutils libaudioclient \

        libmedia_helper libmediadrm \

        libmediametrics \

        libbase \

        libhidlbase \

        libhidltransport \

media/libmediametrics/Android.mk

0 → 100644
+34 −0
Original line number Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)



include $(CLEAR_VARS)



LOCAL_SRC_FILES += \

    IMediaAnalyticsService.cpp \

    MediaAnalyticsItem.cpp \



LOCAL_SHARED_LIBRARIES := \

        liblog libcutils libutils libbinder \

        libstagefright_foundation \

        libbase \



LOCAL_MODULE:= libmediametrics



LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk



LOCAL_C_INCLUDES := \

    $(TOP)/system/libhidl/base/include \

    $(TOP)/frameworks/native/include/media/openmax \

    $(TOP)/frameworks/av/include/media/ \

    $(TOP)/frameworks/av/media/libmedia/aidl \

    $(TOP)/frameworks/av/include \

    $(TOP)/frameworks/native/include \

    $(call include-path-for, audio-utils)



LOCAL_EXPORT_C_INCLUDE_DIRS := \

    frameworks/av/include/media \



LOCAL_CFLAGS += -Werror -Wno-error=deprecated-declarations -Wall

LOCAL_SANITIZE := unsigned-integer-overflow signed-integer-overflow cfi

LOCAL_SANITIZE_DIAG := cfi



include $(BUILD_SHARED_LIBRARY)

media/libmedia/IMediaAnalyticsService.cpp→media/libmediametrics/IMediaAnalyticsService.cpp

+0 −9
Original line number Diff line number Diff line
@@ -23,15 +23,6 @@ 
#include <binder/Parcel.h>

#include <binder/IMemory.h>

#include <binder/IPCThreadState.h>

#include <media/IHDCP.h>

#include <media/IMediaCodecList.h>

#include <media/IMediaHTTPService.h>

#include <media/IMediaPlayerService.h>

#include <media/IMediaRecorder.h>

#include <media/IOMX.h>

#include <media/IRemoteDisplay.h>

#include <media/IRemoteDisplayClient.h>

#include <media/IStreamSource.h>



#include <utils/Errors.h>  // for status_t

#include <utils/List.h>