diff options
| author | Manikanta Kanamarlapudi <kmanikan@codeaurora.org> | 2018-03-05 16:26:27 +0530 |
|---|---|---|
| committer | Manikanta Kanamarlapudi <kmanikan@codeaurora.org> | 2018-03-27 12:03:07 +0530 |
| commit | ebb75f28d9dc228fbecbfd3230af223a86124aea (patch) | |
| tree | cb3b2ffa69586c808ead8367272b615ce8ecaa2b /libstagefrighthw | |
| parent | 4278ec3722d5770f3c02114c1699819f1fcb4589 (diff) | |
| download | media-ebb75f28d9dc228fbecbfd3230af223a86124aea.tar.gz | |
media: change way of accessing aosp project headers
- Remove hardcode paths of aosp headers in vendor
make files.
- Add aosp header libraries to access aosp headers.
CRs-Fixed: 2206443
Change-Id: Ib2b4f1ddeb48397bbe2afdfb9ac54cc3cb3fd9ac
Diffstat (limited to 'libstagefrighthw')
| -rw-r--r-- | libstagefrighthw/Android.mk | 10 | ||||
| -rw-r--r-- | libstagefrighthw/QComOMXMetadata.h | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/libstagefrighthw/Android.mk b/libstagefrighthw/Android.mk index 4979a21f..89f17d7b 100644 --- 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 e6b4579e..f1d2688f 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"); @@ -18,7 +18,7 @@ #ifndef QCOM_OMX_METADATA_H_ #define QCOM_OMX_METADATA_H_ -#include <system/window.h> +#include "cutils/native_handle.h" #include <media/hardware/MetadataBufferType.h> namespace android { |