diff options
| author | Justin Yun <justinyun@google.com> | 2018-03-27 17:01:51 +0900 |
|---|---|---|
| committer | Justin Yun <justinyun@google.com> | 2018-03-28 00:09:46 +0000 |
| commit | 26535a59774787f648b6b2d4c0b52790f193b686 (patch) | |
| tree | f0c7e41197d31ad46054d837fc9d2e226835517c | |
| parent | c8458fbea213076983f21c6fe5e505dc480d72cf (diff) | |
| download | android_hardware_qcom_sdm845_media-26535a59774787f648b6b2d4c0b52790f193b686.tar.gz android_hardware_qcom_sdm845_media-26535a59774787f648b6b2d4c0b52790f193b686.tar.bz2 android_hardware_qcom_sdm845_media-26535a59774787f648b6b2d4c0b52790f193b686.zip | |
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
| -rw-r--r-- | mm-core/inc/qc_omx_msg.h | 4 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/common/Android.mk | 2 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/common/src/vidc_common.cpp | 2 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/common/src/vidc_vendor_extensions.cpp | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/mm-core/inc/qc_omx_msg.h b/mm-core/inc/qc_omx_msg.h index e0c85929..a644c255 100644 --- a/mm-core/inc/qc_omx_msg.h +++ b/mm-core/inc/qc_omx_msg.h @@ -39,7 +39,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifdef _ENABLE_QC_MSG_LOG_ #ifdef _ANDROID_ - #include <utils/Log.h> + #include <log/log.h> #ifdef __cplusplus extern "C" { @@ -79,7 +79,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #endif // _ANDROID_ #else #ifdef _ANDROID_ - #include <utils/Log.h> + #include <log/log.h> #define DEBUG_PRINT_ERROR ALOGV #define DEBUG_PRINT ALOGV #define DEBUG_DETAIL ALOGV 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" |