From: Steven Moreland <smoreland@google.com>
Date: Thu, 20 Jul 2017 03:05:02 +0000 (+0000)
Subject: Merge "frameworks/base: use proper nativehelper headers" am: 826eafd958 am: 5c091dc944
X-Git-Tag: android-x86-9.0-r1~1030^2~4
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9f430b2782849090d2e5e3737304cd26724366fa;p=android-x86%2Fframeworks-base.git

Merge "frameworks/base: use proper nativehelper headers" am: 826eafd958 am: 5c091dc944
am: c840945a78

Change-Id: I654e14f0d1b495450db81592a2e564e308746350
---

9f430b2782849090d2e5e3737304cd26724366fa
diff --cc services/core/jni/com_android_server_VibratorService.cpp
index 45e9cc785bf8,810d785a9811..0370490668ec
--- a/services/core/jni/com_android_server_VibratorService.cpp
+++ b/services/core/jni/com_android_server_VibratorService.cpp
@@@ -18,10 -18,9 +18,10 @@@
  
  #include <android/hardware/vibrator/1.0/IVibrator.h>
  #include <android/hardware/vibrator/1.0/types.h>
 +#include <android/hardware/vibrator/1.1/IVibrator.h>
  
  #include "jni.h"
- #include "JNIHelp.h"
+ #include <nativehelper/JNIHelp.h>
  #include "android_runtime/AndroidRuntime.h"
  
  #include <utils/misc.h>