Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17ee680d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "fallout of splitting libsensor out of libgui"

parents 3d91f110 caf89309

core/jni/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -249,6 +249,7 @@ LOCAL_SHARED_LIBRARIES := \ 
    libbinder \

    libui \

    libgui \

    libsensor \

    libinput \

    libcamera_client \

    libcamera_metadata \

core/jni/android_hardware_SensorManager.cpp

+3 −3
Original line number Diff line number Diff line
@@ -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>

native/android/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ LOCAL_SHARED_LIBRARIES := \ 
    libbinder \

    libui \

    libgui \

    libsensor \

    libandroid_runtime \

    libnetd_client \

native/android/sensor.cpp

+3 −3
Original line number Diff line number Diff line
@@ -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>