summaryrefslogtreecommitdiff
path: root/mm-video-v4l2
diff options
context:
space:
mode:
authorJustin Yun <justinyun@google.com>2018-03-27 17:01:51 +0900
committerJustin Yun <justinyun@google.com>2018-03-28 00:09:46 +0000
commit26535a59774787f648b6b2d4c0b52790f193b686 (patch)
treef0c7e41197d31ad46054d837fc9d2e226835517c /mm-video-v4l2
parentc8458fbea213076983f21c6fe5e505dc480d72cf (diff)
downloadmedia-26535a59774787f648b6b2d4c0b52790f193b686.tar.gz
Build libOmxVidcCommon with BOARD_VNDK_VERSION
Add missing header libraries and change headers. Bug: 69574580 Test: BOARD_VNDK_VERSION=current m -j libOmxVidcCommon Change-Id: I59f2f7031bdaf5c3614359fe74b445a2c871634c
Diffstat (limited to 'mm-video-v4l2')
-rw-r--r--mm-video-v4l2/vidc/common/Android.mk2
-rw-r--r--mm-video-v4l2/vidc/common/src/vidc_common.cpp2
-rw-r--r--mm-video-v4l2/vidc/common/src/vidc_vendor_extensions.cpp2
3 files changed, 4 insertions, 2 deletions
diff --git a/mm-video-v4l2/vidc/common/Android.mk b/mm-video-v4l2/vidc/common/Android.mk
index 2f48db94..7f06be6e 100644
--- a/mm-video-v4l2/vidc/common/Android.mk
+++ b/mm-video-v4l2/vidc/common/Android.mk
@@ -28,11 +28,13 @@ libmm-vidc-inc += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
LOCAL_MODULE := libOmxVidcCommon
LOCAL_MODULE_TAGS := optional
+LOCAL_PROPRIETARY_MODULE := true
LOCAL_CFLAGS := $(libmm-vidc-def)
LOCAL_C_INCLUDES := $(libmm-vidc-inc)
LOCAL_PRELINK_MODULE := false
LOCAL_SHARED_LIBRARIES := liblog libcutils libdl
+LOCAL_HEADER_LIBRARIES := libutils_headers
LOCAL_SRC_FILES += src/vidc_common.cpp
LOCAL_SRC_FILES += src/vidc_vendor_extensions.cpp
diff --git a/mm-video-v4l2/vidc/common/src/vidc_common.cpp b/mm-video-v4l2/vidc/common/src/vidc_common.cpp
index f787b905..f960e963 100644
--- a/mm-video-v4l2/vidc/common/src/vidc_common.cpp
+++ b/mm-video-v4l2/vidc/common/src/vidc_common.cpp
@@ -28,7 +28,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------------*/
#define LOG_TAG "OMX_COMMON"
-#include <utils/Log.h>
+#include <log/log.h>
#include "vidc_debug.h"
#include "vidc_common.h"
#include "OMX_Core.h"
diff --git a/mm-video-v4l2/vidc/common/src/vidc_vendor_extensions.cpp b/mm-video-v4l2/vidc/common/src/vidc_vendor_extensions.cpp
index 3b06bc7c..e1ed639e 100644
--- a/mm-video-v4l2/vidc/common/src/vidc_vendor_extensions.cpp
+++ b/mm-video-v4l2/vidc/common/src/vidc_vendor_extensions.cpp
@@ -28,7 +28,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------------*/
#define LOG_TAG "OMX-VENDOR-EXT"
-#include <utils/Log.h>
+#include <log/log.h>
#include "vidc_debug.h"
#include "OMX_Core.h"