diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2014-12-02 23:11:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-02 23:11:06 +0000 |
| commit | 1147997cdb1be4218fc9f346d02e236683fbde1f (patch) | |
| tree | 169c71a93c50fb4f6bb40ac2878d9b513ba8453f | |
| parent | 667991cb3a5b6baf9acc645967d1b2820e5313bc (diff) | |
| parent | 8875dcd3630c53e115b2e288121f828a387341d7 (diff) | |
| download | media-lollipop-wear-release.tar.gz | |
Merge "Use default system header files."android-wear-5.0.0_r1lollipop-wear-release
| -rw-r--r-- | mm-video-legacy/vidc/vdec.mk | 4 | ||||
| -rw-r--r-- | mm-video-legacy/vidc/venc.mk | 2 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/vdec.mk | 4 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/venc.mk | 4 |
4 files changed, 3 insertions, 11 deletions
diff --git a/mm-video-legacy/vidc/vdec.mk b/mm-video-legacy/vidc/vdec.mk index 8a03382..acdc626 100644 --- a/mm-video-legacy/vidc/vdec.mk +++ b/mm-video-legacy/vidc/vdec.mk @@ -51,9 +51,7 @@ libOmxVdec-def += -DUSE_ION include $(CLEAR_VARS) LOCAL_PATH:= $(ROOT_DIR) -libmm-vdec-inc := bionic/libc/include -libmm-vdec-inc += bionic/libstdc++/include -libmm-vdec-inc += $(LOCAL_PATH)/vdec/inc +libmm-vdec-inc := $(LOCAL_PATH)/vdec/inc libmm-vdec-inc += $(OMX_VIDEO_PATH)/vidc/common/inc libmm-vdec-inc += hardware/qcom/media/mm-core/inc #DRM include - Interface which loads the DRM library diff --git a/mm-video-legacy/vidc/venc.mk b/mm-video-legacy/vidc/venc.mk index 6ae2f16..5092068 100644 --- a/mm-video-legacy/vidc/venc.mk +++ b/mm-video-legacy/vidc/venc.mk @@ -42,8 +42,6 @@ libmm-venc-def += -D_ANDROID_ICS_ include $(CLEAR_VARS) -libmm-venc-inc := bionic/libc/include -libmm-venc-inc += bionic/libstdc++/include libmm-venc-inc := $(LOCAL_PATH)/venc/inc libmm-venc-inc += $(OMX_VIDEO_PATH)/vidc/common/inc libmm-venc-inc += hardware/qcom/media/mm-core/inc diff --git a/mm-video-v4l2/vidc/vdec.mk b/mm-video-v4l2/vidc/vdec.mk index 998cf5b..1f075f3 100644 --- a/mm-video-v4l2/vidc/vdec.mk +++ b/mm-video-v4l2/vidc/vdec.mk @@ -89,9 +89,7 @@ endif include $(CLEAR_VARS) LOCAL_PATH:= $(ROOT_DIR) -libmm-vdec-inc := bionic/libc/include -libmm-vdec-inc += bionic/libstdc++/include -libmm-vdec-inc += $(LOCAL_PATH)/vdec/inc +libmm-vdec-inc := $(LOCAL_PATH)/vdec/inc libmm-vdec-inc += $(OMX_VIDEO_PATH)/vidc/common/inc libmm-vdec-inc += hardware/qcom/media/mm-core/inc #DRM include - Interface which loads the DRM library diff --git a/mm-video-v4l2/vidc/venc.mk b/mm-video-v4l2/vidc/venc.mk index ae3de49..0d58872 100644 --- a/mm-video-v4l2/vidc/venc.mk +++ b/mm-video-v4l2/vidc/venc.mk @@ -75,9 +75,7 @@ libmm-venc-def += -D_ANDROID_ICS_ include $(CLEAR_VARS) -libmm-venc-inc := bionic/libc/include -libmm-venc-inc += bionic/libstdc++/include -libmm-venc-inc += $(LOCAL_PATH)/venc/inc +libmm-venc-inc := $(LOCAL_PATH)/venc/inc libmm-venc-inc += $(OMX_VIDEO_PATH)/vidc/common/inc libmm-venc-inc += hardware/qcom/media/mm-core/inc libmm-venc-inc += hardware/qcom/media/libstagefrighthw |