Merge "Revert "For msm8996, replacing LOCAL_COPY_HEADERS with LOCAL_EXPORT_C_INCLUDE_DIRS, for VNDK""
diff --git a/msm8996/mm-core/Android.mk b/msm8996/mm-core/Android.mk
index 26e7e31..b658ca9 100644
--- a/msm8996/mm-core/Android.mk
+++ b/msm8996/mm-core/Android.mk
@@ -107,6 +107,11 @@
 
 include $(BUILD_SHARED_LIBRARY)
 
+include $(CLEAR_VARS)
+LOCAL_MODULE := OmxCore_headers
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/inc
+include $(BUILD_HEADER_LIBRARY)
+
 #===============================================================================
 #             LIBRARY for command line test apps
 #===============================================================================