summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Mathias Agopian <mathias@google.com> 2017-03-06 16:06:49 -0800
committer Mathias Agopian <mathias@google.com> 2017-03-06 16:09:55 -0800
commitcaf8930960ae68d5be2a8952cc127bf3f154f433 (patch)
tree0dea58fb58cdad356e9e8dc72947f12e8ecce057
parenta3d279fa4b258498f3b7ee678e546a82e76cdaaf (diff)
fallout of splitting libsensor out of libgui
Test: compile & run Bug: treble cleanup Change-Id: Ib696126506cc9df01dcf9e09779ce05ddb69e4b6
-rw-r--r--core/jni/Android.mk1
-rw-r--r--core/jni/android_hardware_SensorManager.cpp6
-rw-r--r--native/android/Android.mk1
-rw-r--r--native/android/sensor.cpp6
4 files changed, 8 insertions, 6 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk
index 68392a9f52bc..c9f9d6f6dfb0 100644
--- a/core/jni/Android.mk
+++ b/core/jni/Android.mk
@@ -249,6 +249,7 @@ LOCAL_SHARED_LIBRARIES := \
libbinder \
libui \
libgui \
+ libsensor \
libinput \
libcamera_client \
libcamera_metadata \
diff --git a/core/jni/android_hardware_SensorManager.cpp b/core/jni/android_hardware_SensorManager.cpp
index bc2fc1c39890..2e907c3d0e09 100644
--- a/core/jni/android_hardware_SensorManager.cpp
+++ b/core/jni/android_hardware_SensorManager.cpp
@@ -23,9 +23,9 @@
#include <ScopedUtfChars.h>
#include <ScopedLocalRef.h>
#include <android_runtime/AndroidRuntime.h>
-#include <gui/Sensor.h>
-#include <gui/SensorEventQueue.h>
-#include <gui/SensorManager.h>
+#include <sensor/Sensor.h>
+#include <sensor/SensorEventQueue.h>
+#include <sensor/SensorManager.h>
#include <cutils/native_handle.h>
#include <utils/Log.h>
#include <utils/Looper.h>
diff --git a/native/android/Android.mk b/native/android/Android.mk
index 57f996cf17ec..6e15331e4baa 100644
--- a/native/android/Android.mk
+++ b/native/android/Android.mk
@@ -32,6 +32,7 @@ LOCAL_SHARED_LIBRARIES := \
libbinder \
libui \
libgui \
+ libsensor \
libandroid_runtime \
libnetd_client \
diff --git a/native/android/sensor.cpp b/native/android/sensor.cpp
index c7bc885ea4b0..ebb0d1229bea 100644
--- a/native/android/sensor.cpp
+++ b/native/android/sensor.cpp
@@ -22,9 +22,9 @@
#include <android/sensor.h>
#include <android/sharedmem.h>
#include <cutils/native_handle.h>
-#include <gui/Sensor.h>
-#include <gui/SensorManager.h>
-#include <gui/SensorEventQueue.h>
+#include <sensor/Sensor.h>
+#include <sensor/SensorManager.h>
+#include <sensor/SensorEventQueue.h>
#include <utils/Looper.h>
#include <utils/RefBase.h>
#include <utils/Timers.h>