commit 3fd320dac30e103a47bdbcf1897deac3d08f99e9
author Robert Shih <robertshih@google.com> Thu Apr 26 16:21:29 2018 -0700
committer Robert Shih <robertshih@google.com> Fri Apr 27 22:26:21 2018 +0000
tree 88073126277312b68ec8726b7fc61e4c7cc59397
parent 64da22285776f07a775afd45f9fc36cea1aa05e3

NdkMediaExtractor: remove `disconnect` from NDK headers

Bug: 63934228
Change-Id: I74f0564bb75dffb934931d0e5f1d34b17916f2b8

media/libmedia/NdkWrapper.cpp

diff --git a/media/libmedia/NdkWrapper.cpp b/media/libmedia/NdkWrapper.cpp
index 6f56d0c..272bc30 100644
--- a/media/libmedia/NdkWrapper.cpp
+++ b/media/libmedia/NdkWrapper.cpp
@@ -31,6 +31,18 @@
 #include <media/stagefright/foundation/AMessage.h>
 #include <utils/Errors.h>
 
+// TODO: remove forward declaration when AMediaExtractor_disconnect is offcially added to NDK
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+media_status_t AMediaExtractor_disconnect(AMediaExtractor *);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 namespace android {
 
 static const size_t kAESBlockSize = 16;  // AES_BLOCK_SIZE

media/ndk/include/media/NdkMediaExtractor.h

diff --git a/media/ndk/include/media/NdkMediaExtractor.h b/media/ndk/include/media/NdkMediaExtractor.h
index 1d295e4..f7b9cfd 100644
--- a/media/ndk/include/media/NdkMediaExtractor.h
+++ b/media/ndk/include/media/NdkMediaExtractor.h
@@ -216,12 +216,6 @@
 
 #endif /* __ANDROID_API__ >= 28 */
 
-#if __ANDROID_API__ >= 29
-
-media_status_t AMediaExtractor_disconnect(AMediaExtractor *ex);
-
-#endif /* __ANDROID_API__ >= 29 */
-
 #endif /* __ANDROID_API__ >= 21 */
 
 __END_DECLS