Remove NdkJavaVMHelper.h from NDK directory
NdkJavaVMHelper.h is not a valid NDK header. Replace this one with
NdkJavaVMHelperPriv.h in the cpp directory.
Bug: 149578834
Test: NativeDecoderTest
Change-Id: I07ddec4d31ae84bf4a739fcf512859f794cb1baa
diff --git a/media/ndk/NdkJavaVMHelper.cpp b/media/ndk/NdkJavaVMHelper.cpp
index baf2744..a77016c 100644
--- a/media/ndk/NdkJavaVMHelper.cpp
+++ b/media/ndk/NdkJavaVMHelper.cpp
@@ -16,7 +16,7 @@
#define LOG_TAG "NdkJavaVMHelper"
-#include <media/NdkJavaVMHelper.h>
+#include "NdkJavaVMHelperPriv.h"
#include <utils/Log.h>
namespace android {
diff --git a/media/ndk/include/media/NdkJavaVMHelper.h b/media/ndk/NdkJavaVMHelperPriv.h
similarity index 86%
rename from media/ndk/include/media/NdkJavaVMHelper.h
rename to media/ndk/NdkJavaVMHelperPriv.h
index 1c20275..49f087e 100644
--- a/media/ndk/include/media/NdkJavaVMHelper.h
+++ b/media/ndk/NdkJavaVMHelperPriv.h
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-#ifndef NDK_JAVA_VM_HELPER_H_
+#ifndef NDK_JAVA_VM_HELPER_PRIV_H_
-#define NDK_JAVA_VM_HELPER_H_
+#define NDK_JAVA_VM_HELPER_PRIV_H_
#include "jni.h"
@@ -28,4 +28,4 @@
} // namespace android
-#endif // NDK_JAVA_VM_HELPER_H_
\ No newline at end of file
+#endif // NDK_JAVA_VM_HELPER_PRIV_H_
\ No newline at end of file
diff --git a/media/ndk/NdkMediaDataSource.cpp b/media/ndk/NdkMediaDataSource.cpp
index 98ccd6c..3e6d7d6 100644
--- a/media/ndk/NdkMediaDataSource.cpp
+++ b/media/ndk/NdkMediaDataSource.cpp
@@ -17,6 +17,7 @@
//#define LOG_NDEBUG 0
#define LOG_TAG "NdkMediaDataSource"
+#include "NdkJavaVMHelperPriv.h"
#include "NdkMediaDataSourcePriv.h"
#include <inttypes.h>
@@ -30,7 +31,6 @@
#include <datasource/HTTPBase.h>
#include <datasource/NuCachedSource2.h>
#include <media/IMediaHTTPService.h>
-#include <media/NdkJavaVMHelper.h>
#include <media/NdkMediaError.h>
#include <media/NdkMediaDataSource.h>
#include <media/stagefright/InterfaceUtils.h>