Move AWakeLock from foundation to libmediaplayerservice
This removes libpowermanager dependency from libstagefright_foundation.
AWakeLock is being used only in libmediaplayerservice.
Test: build
Bug: 65851881
Change-Id: I1a34210f66fd4fdc30b7aa6467b642fd99b71731
diff --git a/media/libmediaplayerservice/Android.mk b/media/libmediaplayerservice/Android.mk
index 11066b2..06c2106 100644
--- a/media/libmediaplayerservice/Android.mk
+++ b/media/libmediaplayerservice/Android.mk
@@ -28,6 +28,7 @@
libmediadrm \
libmediautils \
libmemunreachable \
+ libpowermanager \
libstagefright \
libstagefright_foundation \
libstagefright_httplive \
diff --git a/media/libstagefright/foundation/AWakeLock.cpp b/media/libmediaplayerservice/nuplayer/AWakeLock.cpp
similarity index 98%
rename from media/libstagefright/foundation/AWakeLock.cpp
rename to media/libmediaplayerservice/nuplayer/AWakeLock.cpp
index d9277ac..684ba2e 100644
--- a/media/libstagefright/foundation/AWakeLock.cpp
+++ b/media/libmediaplayerservice/nuplayer/AWakeLock.cpp
@@ -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>
diff --git a/media/libstagefright/foundation/include/media/stagefright/foundation/AWakeLock.h b/media/libmediaplayerservice/nuplayer/AWakeLock.h
similarity index 100%
rename from media/libstagefright/foundation/include/media/stagefright/foundation/AWakeLock.h
rename to media/libmediaplayerservice/nuplayer/AWakeLock.h
diff --git a/media/libmediaplayerservice/nuplayer/Android.mk b/media/libmediaplayerservice/nuplayer/Android.mk
index c582631..b7978e1 100644
--- a/media/libmediaplayerservice/nuplayer/Android.mk
+++ b/media/libmediaplayerservice/nuplayer/Android.mk
@@ -2,6 +2,7 @@
include $(CLEAR_VARS)
LOCAL_SRC_FILES:= \
+ AWakeLock.cpp \
GenericSource.cpp \
HTTPLiveSource.cpp \
NuPlayer.cpp \
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
index 50db4c9..de2c6db 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
@@ -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>
diff --git a/media/libstagefright/foundation/Android.bp b/media/libstagefright/foundation/Android.bp
index 459ada1..ae3d388 100644
--- a/media/libstagefright/foundation/Android.bp
+++ b/media/libstagefright/foundation/Android.bp
@@ -45,7 +45,6 @@
"libutils",
"libcutils",
"liblog",
- "libpowermanager",
],
srcs: [
@@ -61,7 +60,6 @@
"ANetworkSession.cpp",
"AString.cpp",
"AStringUtils.cpp",
- "AWakeLock.cpp",
"ColorUtils.cpp",
"MediaBuffer.cpp",
"MediaBufferGroup.cpp",
@@ -71,13 +69,6 @@
"hexdump.cpp",
],
- target: {
- vendor: {
- exclude_shared_libs: ["libpowermanager"],
- exclude_srcs: ["AWakeLock.cpp"],
- },
- },
-
clang: true,
sanitize: {