commit | 29862d783a985bc0c46de45253010b8ce4e0ea7d | [log] [tgz] |
---|---|---|
author | Glenn Kasten <gkasten@google.com> | Wed Aug 02 23:55:28 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Aug 02 23:55:28 2017 +0000 |
tree | 0ef2a33c401578cb062702db7ccdacfe182dfb52 | |
parent | f4de3303e528a93c7e390cc17cd821c4d61ddd1a [diff] | |
parent | 6952bbc50842c30e3f6becafd9970b2732e2426e [diff] |
Merge "Make OpenSLES_Android.h also include OpenSLES.h" am: 6952bbc508 Change-Id: I0ebe915141878d153f07ccaefa60f27a8aeda5a6
diff --git a/include/OMXAL/OpenMAXAL_Android.h b/include/OMXAL/OpenMAXAL_Android.h index 34b9dd9..0ea22f0 100644 --- a/include/OMXAL/OpenMAXAL_Android.h +++ b/include/OMXAL/OpenMAXAL_Android.h
@@ -17,6 +17,8 @@ #ifndef OPENMAX_AL_ANDROID_H_ #define OPENMAX_AL_ANDROID_H_ +#include "OpenMAXAL.h" + #ifdef __cplusplus extern "C" { #endif
diff --git a/include/SLES/OpenSLES_Android.h b/include/SLES/OpenSLES_Android.h index 7122058..e9e2f05 100644 --- a/include/SLES/OpenSLES_Android.h +++ b/include/SLES/OpenSLES_Android.h
@@ -17,6 +17,7 @@ #ifndef OPENSL_ES_ANDROID_H_ #define OPENSL_ES_ANDROID_H_ +#include "OpenSLES.h" #include "OpenSLES_AndroidConfiguration.h" #include "OpenSLES_AndroidMetadata.h" #include <jni.h>