AV Android make files changes
o plus a few file relocation: ActivityManager.cpp/h, SoundPool.h, etc
o remove some runtime dependencies to libandroid, libandroid_runtime, etc
Change-Id: I047a47c5fb361dd5cf85cd98798c39f629a75d10
diff --git a/drm/common/Android.mk b/drm/common/Android.mk
index f1136c9..db67534 100644
--- a/drm/common/Android.mk
+++ b/drm/common/Android.mk
@@ -32,9 +32,9 @@
ReadWriteUtils.cpp
LOCAL_C_INCLUDES := \
- $(TOP)/frameworks/base/include \
- $(TOP)/frameworks/base/drm/libdrmframework/include \
- $(TOP)/frameworks/base/drm/libdrmframework/plugins/common/include
+ $(TOP)/frameworks/av/include \
+ $(TOP)/frameworks/av/drm/libdrmframework/include \
+ $(TOP)/frameworks/av/drm/libdrmframework/plugins/common/include
LOCAL_MODULE:= libdrmframeworkcommon
diff --git a/drm/drmserver/Android.mk b/drm/drmserver/Android.mk
index fd417cb..96205a1 100644
--- a/drm/drmserver/Android.mk
+++ b/drm/drmserver/Android.mk
@@ -30,9 +30,9 @@
LOCAL_STATIC_LIBRARIES := libdrmframeworkcommon
LOCAL_C_INCLUDES := \
- $(TOP)/frameworks/base/include \
- $(TOP)/frameworks/base/drm/libdrmframework/include \
- $(TOP)/frameworks/base/drm/libdrmframework/plugins/common/include
+ $(TOP)/frameworks/av/include \
+ $(TOP)/frameworks/av/drm/libdrmframework/include \
+ $(TOP)/frameworks/av/drm/libdrmframework/plugins/common/include
LOCAL_MODULE:= drmserver
diff --git a/drm/libdrmframework/Android.mk b/drm/libdrmframework/Android.mk
index c534402..9e07fe3 100644
--- a/drm/libdrmframework/Android.mk
+++ b/drm/libdrmframework/Android.mk
@@ -32,8 +32,8 @@
libdrmframeworkcommon
LOCAL_C_INCLUDES += \
- $(TOP)/frameworks/base/drm/libdrmframework/include \
- $(TOP)/frameworks/base/include
+ $(TOP)/frameworks/av/drm/libdrmframework/include \
+ $(TOP)/frameworks/av/include
diff --git a/drm/libdrmframework/plugins/common/util/Android.mk b/drm/libdrmframework/plugins/common/util/Android.mk
index 15dda80..d096453 100644
--- a/drm/libdrmframework/plugins/common/util/Android.mk
+++ b/drm/libdrmframework/plugins/common/util/Android.mk
@@ -26,12 +26,10 @@
libutils \
libdl \
libdvm \
- libandroid_runtime \
- libnativehelper \
liblog
-base := frameworks/base
+base := frameworks/av
LOCAL_C_INCLUDES += \
$(JNI_H_INCLUDE) \
diff --git a/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk b/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk
index e359dbd..7c2b622 100644
--- a/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk
+++ b/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk
@@ -20,7 +20,7 @@
# The flag below turns on local debug printouts
#LOCAL_CFLAGS += -DDRM_OMA_FL_ENGINE_DEBUG
-base := frameworks/base
+base := frameworks/av
# Determine whether the DRM framework uses 64-bit data types for file offsets and do the same.
ifneq ($(shell grep -c 'off64_t offset' $(base)/drm/libdrmframework/plugins/common/include/IDrmEngine.h), 0)
@@ -37,8 +37,6 @@
libicuuc \
libutils \
libdl \
- libandroid_runtime \
- libnativehelper \
libcrypto \
libssl \
libdrmframework
diff --git a/drm/libdrmframework/plugins/forward-lock/internal-format/converter/Android.mk b/drm/libdrmframework/plugins/forward-lock/internal-format/converter/Android.mk
index 00bb788..37a3851 100644
--- a/drm/libdrmframework/plugins/forward-lock/internal-format/converter/Android.mk
+++ b/drm/libdrmframework/plugins/forward-lock/internal-format/converter/Android.mk
@@ -21,7 +21,7 @@
FwdLockConv.c
LOCAL_C_INCLUDES := \
- frameworks/base/drm/libdrmframework/plugins/forward-lock/internal-format/common \
+ frameworks/av/drm/libdrmframework/plugins/forward-lock/internal-format/common \
external/openssl/include
LOCAL_SHARED_LIBRARIES := libcrypto
diff --git a/drm/libdrmframework/plugins/forward-lock/internal-format/decoder/Android.mk b/drm/libdrmframework/plugins/forward-lock/internal-format/decoder/Android.mk
index b625edf..d9b5cfd 100644
--- a/drm/libdrmframework/plugins/forward-lock/internal-format/decoder/Android.mk
+++ b/drm/libdrmframework/plugins/forward-lock/internal-format/decoder/Android.mk
@@ -21,7 +21,7 @@
FwdLockFile.c
LOCAL_C_INCLUDES := \
- frameworks/base/drm/libdrmframework/plugins/forward-lock/internal-format/common \
+ frameworks/av/drm/libdrmframework/plugins/forward-lock/internal-format/common \
external/openssl/include
LOCAL_SHARED_LIBRARIES := libcrypto
diff --git a/drm/libdrmframework/plugins/passthru/Android.mk b/drm/libdrmframework/plugins/passthru/Android.mk
index d0d1439..d170d49 100644
--- a/drm/libdrmframework/plugins/passthru/Android.mk
+++ b/drm/libdrmframework/plugins/passthru/Android.mk
@@ -29,10 +29,10 @@
LOCAL_C_INCLUDES += \
- $(TOP)/frameworks/base/drm/libdrmframework/include \
- $(TOP)/frameworks/base/drm/libdrmframework/plugins/passthru/include \
- $(TOP)/frameworks/base/drm/libdrmframework/plugins/common/include \
- $(TOP)/frameworks/base/include
+ $(TOP)/frameworks/av/drm/libdrmframework/include \
+ $(TOP)/frameworks/av/drm/libdrmframework/plugins/passthru/include \
+ $(TOP)/frameworks/av/drm/libdrmframework/plugins/common/include \
+ $(TOP)/frameworks/av/include
# Set the following flag to enable the decryption passthru flow
#LOCAL_CFLAGS += -DENABLE_PASSTHRU_DECRYPTION