Don't rely on transitively included headers
am: 439eb0f241 -s ours
Change-Id: I2a4c32899119b7ef0e26aa0aef46fae85c6c61f4
diff --git a/Android.bp b/Android.bp
index e49aa25..7ae27e8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -6,11 +6,13 @@
"libaudio_system_headers",
"libsystem_headers",
"libcutils_headers",
+ "libbluetooth-types-header",
],
export_header_lib_headers: [
"libaudio_system_headers",
"libsystem_headers",
"libcutils_headers",
+ "libbluetooth-types-header",
],
export_include_dirs: ["include"],
diff --git a/include/hardware/sensors.h b/include/hardware/sensors.h
index dde997f..d058d3b 100644
--- a/include/hardware/sensors.h
+++ b/include/hardware/sensors.h
@@ -578,10 +578,11 @@
* sensor_handle is the handle of the sensor to change.
* enabled set to 1 to enable, or 0 to disable the sensor.
*
- * After sensor de-activation, existing sensor events that have not
- * been picked up by poll() should be abandoned immediately so that
- * subsequent activation will not get stale sensor events (events
- * that is generated prior to the latter activation).
+ * Before sensor activation, existing sensor events that have not
+ * been picked up by poll() should be abandoned so that application
+ * upon new activation request will not get stale events.
+ * (events that are generated during latter activation or during
+ * data injection mode after sensor deactivation)
*
* Return 0 on success, negative errno code otherwise.
*/
diff --git a/modules/input/evdev/Android.mk b/modules/input/evdev/Android.mk
index 9a5d092..52b195f 100644
--- a/modules/input/evdev/Android.mk
+++ b/modules/input/evdev/Android.mk
@@ -33,7 +33,7 @@
libutils
LOCAL_CLANG := true
-LOCAL_CPPFLAGS += -std=c++14 -Wno-unused-parameter
+LOCAL_CPPFLAGS += -Wno-unused-parameter
LOCAL_MODULE := libinput_evdev
LOCAL_MODULE_TAGS := optional
@@ -54,7 +54,7 @@
liblog
LOCAL_CLANG := true
-LOCAL_CPPFLAGS += -std=c++14 -Wno-unused-parameter
+LOCAL_CPPFLAGS += -Wno-unused-parameter
LOCAL_MODULE_TAGS := optional
diff --git a/tests/hardware/Android.mk b/tests/hardware/Android.mk
index 02540c9..9927343 100644
--- a/tests/hardware/Android.mk
+++ b/tests/hardware/Android.mk
@@ -4,7 +4,7 @@
LOCAL_MODULE := static-hal-check
LOCAL_SRC_FILES := struct-size.cpp struct-offset.cpp struct-last.cpp
LOCAL_SHARED_LIBRARIES := libhardware
-LOCAL_CFLAGS := -std=gnu++11 -O0
+LOCAL_CFLAGS := -O0
LOCAL_C_INCLUDES += \
system/media/camera/include
diff --git a/tests/input/evdev/Android.mk b/tests/input/evdev/Android.mk
index b892a7f..7f62649 100644
--- a/tests/input/evdev/Android.mk
+++ b/tests/input/evdev/Android.mk
@@ -21,7 +21,6 @@
LOCAL_CLANG := true
LOCAL_CFLAGS += -Wall -Wextra -Wno-unused-parameter
-LOCAL_CPPFLAGS += -std=c++14
# TestHelpers uses mktemp. As the path is given to TempFile, we can't do too much
# here (e.g., use mkdtemp first). At least races will lead to an early failure, as