summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2020-01-16 14:55:08 -0800
committerLinux Build Service Account <lnxbuild@localhost>2020-01-16 14:55:08 -0800
commit5f650147bbb606ed5a82cf2db5a82290f9d50ba7 (patch)
treec6f51d418a5f448936660ddf9f00913346b344fd
parent6c010bf239dee346bf9e2b6e593501b66d80e9e6 (diff)
parente70dc84ccdaf1f0505a4b60ace5abf06cc7684d5 (diff)
downloadmedia-5f650147bbb606ed5a82cf2db5a82290f9d50ba7.tar.gz
Merge e70dc84ccdaf1f0505a4b60ace5abf06cc7684d5 on remote branch
Change-Id: I618ba1df64ea9d9d3070595aa29cedca8c340036
-rw-r--r--mm-core/Android.mk20
1 files changed, 16 insertions, 4 deletions
diff --git a/mm-core/Android.mk b/mm-core/Android.mk
index 37a954e0..4933092a 100644
--- a/mm-core/Android.mk
+++ b/mm-core/Android.mk
@@ -66,11 +66,13 @@ LOCAL_COPY_HEADERS += inc/QCMetaData.h
#===============================================================================
LOCAL_C_INCLUDES := $(LOCAL_PATH)/src/common
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/inc
LOCAL_C_INCLUDES += $(TOP)/hardware/qcom/media/libplatformconfig
LOCAL_HEADER_LIBRARIES := \
- libutils_headers
+ libutils_headers \
+ libomxcore_headers
+
+LOCAL_EXPORT_HEADER_LIBRARY_HEADERS := libomxcore_headers
LOCAL_PRELINK_MODULE := false
LOCAL_MODULE := libOmxCore
@@ -99,11 +101,13 @@ include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)
LOCAL_C_INCLUDES := $(LOCAL_PATH)/src/common
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/inc
LOCAL_C_INCLUDES += $(TOP)/hardware/qcom/media/libplatformconfig
LOCAL_HEADER_LIBRARIES := \
- libutils_headers
+ libutils_headers \
+ libomxcore_headers
+
+LOCAL_EXPORT_HEADER_LIBRARY_HEADERS := libomxcore_headers
LOCAL_PRELINK_MODULE := false
LOCAL_MODULE := libmm-omxcore
@@ -125,4 +129,12 @@ endif
include $(BUILD_SHARED_LIBRARY)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libomxcore_headers
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/inc
+LOCAL_PROPRIETARY_MODULE := true
+
+include $(BUILD_HEADER_LIBRARY)
+
endif #BUILD_TINY_ANDROID