Merge "Remove NdkJavaVMHelper.h from NDK directory" (d294ed9a) · Commits · e / os / android_frameworks_av

media/ndk/NdkJavaVMHelper.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@

		#define LOG_TAG "NdkJavaVMHelper"

		#include <media/NdkJavaVMHelper.h>
		#include "NdkJavaVMHelperPriv.h"
		#include <utils/Log.h>

		namespace android {

+3 −3

Original line number	Diff line number	Diff line
		@@ -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 @@ struct NdkJavaVMHelper {

		} // 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

+1 −1

Original line number	Diff line number	Diff line
		@@ -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>