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

Commit ac835db1 authored by Dongwon Kang's avatar Dongwon Kang Committed by Android (Google) Code Review
Browse files

Merge "Move AWakeLock from foundation to libmediaplayerservice"

parents 960a62f2 3dced075

media/libmediaplayerservice/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ LOCAL_SHARED_LIBRARIES := \ 
    libmediadrm                 \

    libmediautils               \

    libmemunreachable           \

    libpowermanager             \

    libstagefright              \

    libstagefright_foundation   \

    libstagefright_httplive     \

media/libstagefright/foundation/AWakeLock.cpp→media/libmediaplayerservice/nuplayer/AWakeLock.cpp

+1 −1
Original line number Diff line number Diff line
@@ -18,11 +18,11 @@ 
#define LOG_TAG "AWakeLock"

#include <utils/Log.h>



#include "ADebug.h"

#include "AWakeLock.h"



#include <binder/IPCThreadState.h>

#include <binder/IServiceManager.h>

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

#include <powermanager/PowerManager.h>

media/libmediaplayerservice/nuplayer/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ LOCAL_PATH:= $(call my-dir) 
include $(CLEAR_VARS)



LOCAL_SRC_FILES:=                       \

        AWakeLock.cpp               \

        GenericSource.cpp               \

        HTTPLiveSource.cpp              \

        NuPlayer.cpp                    \

media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -18,13 +18,13 @@ 
#define LOG_TAG "NuPlayerRenderer"

#include <utils/Log.h>



#include "AWakeLock.h"

#include "NuPlayerRenderer.h"

#include <algorithm>

#include <cutils/properties.h>

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

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

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

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

#include <media/stagefright/MediaClock.h>

#include <media/stagefright/MediaErrors.h>

#include <media/stagefright/MetaData.h>