summaryrefslogtreecommitdiff
path: root/msm8974/libstagefrighthw
diff options
context:
space:
mode:
authorVijay Venkatraman <vijaykv@google.com>2016-12-06 17:30:54 -0800
committerVijay Venkatraman <vijaykv@google.com>2017-01-18 19:39:36 -0800
commit7bbd6afa54e361119c348c96eada150d998b3246 (patch)
tree68920abd42c5fe6380136181c9ace79e25953d4f /msm8974/libstagefrighthw
parent0655dec92ac04cc6084f0f3a32df6a4c492caf4b (diff)
downloadmedia-7bbd6afa54e361119c348c96eada150d998b3246.tar.gz
Replacing LOCAL_COPY_HEADERS with LOCAL_EXPORT_C_INCLUDE_DIRS, for VNDK
Moved msm8974/mm-core header files from inc/ to inc/mm-core/omxcore for exporting. Moved msm8974/mm-video-v4l2/DivxDrmDecrypt headers to subfolder for exporting. Moved msm8974/libstagefrighthw headers to include/ folder for exporting In msm8974/mm-core, inc/ has newer OMX_* headers than inc/mm-core/omxcore and frameworks/native/include/media/openmax. Updating these headers will be handled in a separate CL. Test: Add lib to LOCAL_EXPORT_SHARED_LIBRARIES Change-Id: I4cdfe3085a459abdbd3de491eed10cdceadc4a85
Diffstat (limited to 'msm8974/libstagefrighthw')
-rwxr-xr-xmsm8974/libstagefrighthw/Android.mk5
-rw-r--r--msm8974/libstagefrighthw/include/QComOMXMetadata.h (renamed from msm8974/libstagefrighthw/QComOMXMetadata.h)0
-rw-r--r--msm8974/libstagefrighthw/include/QComOMXPlugin.h (renamed from msm8974/libstagefrighthw/QComOMXPlugin.h)0
3 files changed, 2 insertions, 3 deletions
diff --git a/msm8974/libstagefrighthw/Android.mk b/msm8974/libstagefrighthw/Android.mk
index c290177..9f0e890 100755
--- a/msm8974/libstagefrighthw/Android.mk
+++ b/msm8974/libstagefrighthw/Android.mk
@@ -23,6 +23,7 @@ LOCAL_SRC_FILES := \
LOCAL_CFLAGS := $(PV_CFLAGS_MINUS_VISIBILITY)
LOCAL_C_INCLUDES:= \
+ $(LOCAL_PATH)/include \
frameworks/native/include/media/openmax \
frameworks/native/include/media/hardware
@@ -33,9 +34,7 @@ LOCAL_SHARED_LIBRARIES := \
libdl \
libui \
-LOCAL_COPY_HEADERS_TO := qcom/media
-LOCAL_COPY_HEADERS := QComOMXMetadata.h \
- QComOMXPlugin.h
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
LOCAL_MODULE := libstagefrighthw
diff --git a/msm8974/libstagefrighthw/QComOMXMetadata.h b/msm8974/libstagefrighthw/include/QComOMXMetadata.h
index 90e9172..90e9172 100644
--- a/msm8974/libstagefrighthw/QComOMXMetadata.h
+++ b/msm8974/libstagefrighthw/include/QComOMXMetadata.h
diff --git a/msm8974/libstagefrighthw/QComOMXPlugin.h b/msm8974/libstagefrighthw/include/QComOMXPlugin.h
index fc623e3..fc623e3 100644
--- a/msm8974/libstagefrighthw/QComOMXPlugin.h
+++ b/msm8974/libstagefrighthw/include/QComOMXPlugin.h