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