Merge "frameworks/base: use proper nativehelper headers" am: 826eafd958 (c840945a) · Commits · e / os / android_frameworks_base

core/jni/AndroidRuntime.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -32,8 +32,8 @@
		#include <SkGraphics.h>

		#include "jni.h"
		#include "JNIHelp.h"
		#include "JniInvocation.h"
		#include <nativehelper/JNIHelp.h>
		#include <nativehelper/JniInvocation.h>
		#include "android_util_Binder.h"

		#include <stdio.h>

+1 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		#include "Utils.h"
		#include "core_jni_helpers.h"

		#include <JNIHelp.h>
		#include <nativehelper/JNIHelp.h>
		#include <androidfw/Asset.h>
		#include <androidfw/ResourceTypes.h>
		#include <cutils/compiler.h>

+1 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@
		#include "android_util_Binder.h"
		#include "core_jni_helpers.h"

		#include <JNIHelp.h>
		#include <nativehelper/JNIHelp.h>
		#include <androidfw/Asset.h>
		#include <binder/Parcel.h>
		#include <jni.h>

+1 −1

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@
		#include "SkTypes.h"
		#include "Utils.h"

		#include <JNIHelp.h>
		#include <nativehelper/JNIHelp.h>
		#include <memory>

		static jmethodID gInputStream_readMethodID;

+3 −3

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

		#define LOG_TAG "Minikin"

		#include "JNIHelp.h"
		#include <nativehelper/JNIHelp.h>
		#include <core_jni_helpers.h>

		#include "SkData.h"
		@@ -24,8 +24,8 @@
		#include "SkRefCnt.h"
		#include "SkTypeface.h"
		#include "GraphicsJNI.h"
		#include <ScopedPrimitiveArray.h>
		#include <ScopedUtfChars.h>
		#include <nativehelper/ScopedPrimitiveArray.h>
		#include <nativehelper/ScopedUtfChars.h>
		#include <android_runtime/AndroidRuntime.h>
		#include <android_runtime/android_util_AssetManager.h>
		#include <androidfw/AssetManager.h>