From e9ff127d78b0d08462ddc93d7b1e88c1ef6e2131 Mon Sep 17 00:00:00 2001 From: James Dong Date: Fri, 23 Mar 2012 21:32:01 -0700 Subject: [PATCH] Makefile change because media and drm header files are relocated o related-to-bug: 6214141 Change-Id: I5d5e4169eb05f75c19c1598e05b72e251b2899fb --- proprietary/drmwvmplugin/common.mk | 6 +++--- proprietary/drmwvmplugin/test/Android.mk | 6 +++--- proprietary/streamcontrol/test/Android.mk | 4 ++-- proprietary/wvm/common.mk | 2 +- proprietary/wvm/test/Android.mk | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/proprietary/drmwvmplugin/common.mk b/proprietary/drmwvmplugin/common.mk index 7e19cb4c..1940570d 100644 --- a/proprietary/drmwvmplugin/common.mk +++ b/proprietary/drmwvmplugin/common.mk @@ -4,6 +4,6 @@ LOCAL_C_INCLUDES:= \ $(TOP)/external/stlport/stlport \ $(TOP)/vendor/widevine/proprietary/streamcontrol/include \ $(TOP)/vendor/widevine/proprietary/drmwvmplugin/include \ - $(TOP)/frameworks/base/drm/libdrmframework/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/common/include \ + $(TOP)/frameworks/av/include diff --git a/proprietary/drmwvmplugin/test/Android.mk b/proprietary/drmwvmplugin/test/Android.mk index 99770d65..3895b9fa 100644 --- a/proprietary/drmwvmplugin/test/Android.mk +++ b/proprietary/drmwvmplugin/test/Android.mk @@ -13,8 +13,8 @@ LOCAL_C_INCLUDES+= \ vendor/widevine/proprietary/drmwvmplugin/include \ vendor/widevine/proprietary/streamcontrol/include \ external/stlport/stlport \ - frameworks/base/drm/libdrmframework/include \ - frameworks/base/drm/libdrmframework/plugins/common/include + frameworks/av/drm/libdrmframework/include \ + frameworks/av/drm/libdrmframework/plugins/common/include LOCAL_SHARED_LIBRARIES := \ libstlport \ @@ -32,4 +32,4 @@ LOCAL_MODULE_TAGS := tests include $(BUILD_EXECUTABLE) -endif \ No newline at end of file +endif diff --git a/proprietary/streamcontrol/test/Android.mk b/proprietary/streamcontrol/test/Android.mk index 26439aaf..2e7a41f3 100644 --- a/proprietary/streamcontrol/test/Android.mk +++ b/proprietary/streamcontrol/test/Android.mk @@ -16,8 +16,8 @@ LOCAL_C_INCLUDES += \ external/stlport/stlport \ vendor/widevine/proprietary/streamcontrol/include \ vendor/widevine/proprietary/drmwvmplugin/include \ - frameworks/base/drm/libdrmframework/include \ - frameworks/base/drm/libdrmframework/plugins/common/include + frameworks/av/drm/libdrmframework/include \ + frameworks/av/drm/libdrmframework/plugins/common/include LOCAL_SHARED_LIBRARIES := \ libstlport \ diff --git a/proprietary/wvm/common.mk b/proprietary/wvm/common.mk index aca63705..e90598cf 100644 --- a/proprietary/wvm/common.mk +++ b/proprietary/wvm/common.mk @@ -2,7 +2,7 @@ LOCAL_C_INCLUDES:= \ bionic \ bionic/libstdc++ \ external/stlport/stlport \ - frameworks/base/media/libstagefright/include \ + frameworks/av/media/libstagefright/include \ vendor/widevine/proprietary/streamcontrol/include \ vendor/widevine/proprietary/wvm/include diff --git a/proprietary/wvm/test/Android.mk b/proprietary/wvm/test/Android.mk index 255c8832..32544737 100644 --- a/proprietary/wvm/test/Android.mk +++ b/proprietary/wvm/test/Android.mk @@ -11,7 +11,7 @@ LOCAL_C_INCLUDES+= \ bionic \ vendor/widevine/proprietary/include \ external/stlport/stlport \ - frameworks/base/media/libstagefright + frameworks/av/media/libstagefright LOCAL_SHARED_LIBRARIES := \ libstlport \