diff options
| author | Deva Ramasubramanian <dramasub@codeaurora.org> | 2015-09-18 13:36:39 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-10-05 12:09:43 -0700 |
| commit | af34a82bb83548fa28a0be03144d50646fa65c75 (patch) | |
| tree | 90dd6c2ac3a447ab2c681b224a6b5bb2043eadc3 | |
| parent | 2c57de7472d70f1096331594f798227c05b74ab2 (diff) | |
| download | android_hardware_qcom_media-af34a82bb83548fa28a0be03144d50646fa65c75.tar.gz android_hardware_qcom_media-af34a82bb83548fa28a0be03144d50646fa65c75.tar.bz2 android_hardware_qcom_media-af34a82bb83548fa28a0be03144d50646fa65c75.zip | |
libstagefrighthw: Add header guard to QComOMXMetadata.h and fix file perms
QComOMXMetadata.h causes compilation errors in other files if included
twice due to the lack of a guard.
Also fix the file permissions to remove +x access to group and all.
Change-Id: I3e77d1572e6539060a5c03e46c35c29a18c367fe
| -rw-r--r--[-rwxr-xr-x] | libstagefrighthw/Android.mk | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | libstagefrighthw/MODULE_LICENSE_APACHE2 | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | libstagefrighthw/NOTICE | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | libstagefrighthw/QComOMXMetadata.h | 8 | ||||
| -rw-r--r--[-rwxr-xr-x] | libstagefrighthw/QComOMXPlugin.cpp | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | libstagefrighthw/QComOMXPlugin.h | 0 |
6 files changed, 7 insertions, 1 deletions
diff --git a/libstagefrighthw/Android.mk b/libstagefrighthw/Android.mk index 007e8049..007e8049 100755..100644 --- a/libstagefrighthw/Android.mk +++ b/libstagefrighthw/Android.mk diff --git a/libstagefrighthw/MODULE_LICENSE_APACHE2 b/libstagefrighthw/MODULE_LICENSE_APACHE2 index e69de29b..e69de29b 100755..100644 --- a/libstagefrighthw/MODULE_LICENSE_APACHE2 +++ b/libstagefrighthw/MODULE_LICENSE_APACHE2 diff --git a/libstagefrighthw/NOTICE b/libstagefrighthw/NOTICE index a94ca1f6..a94ca1f6 100755..100644 --- a/libstagefrighthw/NOTICE +++ b/libstagefrighthw/NOTICE diff --git a/libstagefrighthw/QComOMXMetadata.h b/libstagefrighthw/QComOMXMetadata.h index 13168f5d..f03188ef 100755..100644 --- a/libstagefrighthw/QComOMXMetadata.h +++ b/libstagefrighthw/QComOMXMetadata.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 The Linux Foundation. All rights reserved. + * Copyright (C) 2011-2015 The Linux Foundation. All rights reserved. * Copyright (c) 2011 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -14,6 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + +#ifndef QCOM_OMX_METADATA_H_ +#define QCOM_OMX_METADATA_H_ + #include <system/window.h> #include <media/hardware/MetadataBufferType.h> @@ -33,3 +37,5 @@ namespace android { }; #endif } + +#endif diff --git a/libstagefrighthw/QComOMXPlugin.cpp b/libstagefrighthw/QComOMXPlugin.cpp index 9446dcf6..9446dcf6 100755..100644 --- a/libstagefrighthw/QComOMXPlugin.cpp +++ b/libstagefrighthw/QComOMXPlugin.cpp diff --git a/libstagefrighthw/QComOMXPlugin.h b/libstagefrighthw/QComOMXPlugin.h index fc623e3a..fc623e3a 100755..100644 --- a/libstagefrighthw/QComOMXPlugin.h +++ b/libstagefrighthw/QComOMXPlugin.h |