Merge "frameworks/base: use proper nativehelper headers"
am: 826eafd958 Change-Id: I36f10ff4d963284a313f1cc5b368f82549a4adb2
This commit is contained in:
@@ -25,7 +25,7 @@
|
|||||||
|
|
||||||
#include "core_jni_helpers.h"
|
#include "core_jni_helpers.h"
|
||||||
#include <jni.h>
|
#include <jni.h>
|
||||||
#include <ScopedUtfChars.h>
|
#include <nativehelper/ScopedUtfChars.h>
|
||||||
#include <utils/misc.h>
|
#include <utils/misc.h>
|
||||||
#include <utils/Log.h>
|
#include <utils/Log.h>
|
||||||
|
|
||||||
|
|||||||
@@ -24,9 +24,9 @@
|
|||||||
#include <core_jni_helpers.h>
|
#include <core_jni_helpers.h>
|
||||||
#include <jni.h>
|
#include <jni.h>
|
||||||
|
|
||||||
#include <ScopedUtfChars.h>
|
#include <nativehelper/ScopedUtfChars.h>
|
||||||
#include <ScopedLocalRef.h>
|
#include <nativehelper/ScopedLocalRef.h>
|
||||||
#include <ScopedPrimitiveArray.h>
|
#include <nativehelper/ScopedPrimitiveArray.h>
|
||||||
|
|
||||||
#include <utils/Log.h>
|
#include <utils/Log.h>
|
||||||
#include <utils/misc.h>
|
#include <utils/misc.h>
|
||||||
|
|||||||
Reference in New Issue
Block a user