diff options
| author | Daniel Mentz <danielmentz@google.com> | 2018-04-10 18:36:27 -0700 |
|---|---|---|
| committer | Daniel Mentz <danielmentz@google.com> | 2018-04-10 18:36:27 -0700 |
| commit | ba0ed84805a7e4b38fc488723672824284123f42 (patch) | |
| tree | 441805f720d89f2044b369f6e765d92411c3b93c /libstagefrighthw | |
| parent | 8663f4d6b3417bee86d747a8edde934e35062a40 (diff) | |
| parent | 47f48706a8d5827dbe73280c47ec67798ac1f5d7 (diff) | |
| download | media-ba0ed84805a7e4b38fc488723672824284123f42.tar.gz | |
Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.3.9.08.00.00.385.245' into pi-dev
Conflicts:
libstagefrighthw/QComOMXMetadata.h
mm-video-v4l2/vidc/vdec/Android.mk
mm-video-v4l2/vidc/vdec/inc/omx_vdec.h
mm-video-v4l2/vidc/vdec/inc/ts_parser.h
mm-video-v4l2/vidc/venc/Android.mk
Bug: 77871398
Change-Id: Iaade819caadef58cc7b1fdf64f0b549bec102eb9
Diffstat (limited to 'libstagefrighthw')
| -rwxr-xr-x | libstagefrighthw/Android.mk | 10 | ||||
| -rw-r--r-- | libstagefrighthw/QComOMXMetadata.h | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/libstagefrighthw/Android.mk b/libstagefrighthw/Android.mk index bfd12f83..41794158 100755 --- a/libstagefrighthw/Android.mk +++ b/libstagefrighthw/Android.mk @@ -38,10 +38,12 @@ ifeq ($(TARGET_USES_MEDIA_EXTENSIONS),true) LOCAL_CFLAGS += -DUSE_NATIVE_HANDLE_SOURCE endif -LOCAL_C_INCLUDES:= \ - frameworks/native/include/media/openmax \ - $(TARGET_OUT_HEADERS)/mm-core/omxcore/ \ - frameworks/native/include/media/hardware +LOCAL_HEADER_LIBRARIES := \ + media_plugin_headers \ + libcutils_headers \ + libutils_headers + +LOCAL_C_INCLUDES:= $(TARGET_OUT_HEADERS)/mm-core/omxcore/ LOCAL_SHARED_LIBRARIES := \ libutils \ diff --git a/libstagefrighthw/QComOMXMetadata.h b/libstagefrighthw/QComOMXMetadata.h index f349c457..50fae089 100644 --- a/libstagefrighthw/QComOMXMetadata.h +++ b/libstagefrighthw/QComOMXMetadata.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2015 The Linux Foundation. All rights reserved. + * Copyright (C) 2011-2015, 2018 The Linux Foundation. All rights reserved. * Copyright (c) 2011 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); |