commit ecf7fdaceec8b4e476eec39a318c2f18960d8bff
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Nov 08 20:59:33 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 08 20:59:34 2016 +0000
tree 82df78babecf237e1257161a7551ab578b8bc000
parent 25ea04d5f2be2a86c05c3ed01fdf544e8843bd12
parent cd6fd5463d2e9b87504e29a39ac5f2395010805b

Merge "Refactor surfacefinger latchBuffer: Create method"

libs/gui/Android.bp

diff --git a/libs/gui/Android.bp b/libs/gui/Android.bp
index 9e9799b..9ba85a6 100644
--- a/libs/gui/Android.bp
+++ b/libs/gui/Android.bp
@@ -104,7 +104,7 @@
         "liblog",
     ],
 
-    export_shared_lib_headers: ["libbinder"],
+    export_shared_lib_headers: ["libbinder", "libui"],
 }
 
 subdirs = ["tests"]

libs/gui/tests/Android.bp

diff --git a/libs/gui/tests/Android.bp b/libs/gui/tests/Android.bp
index 3c7958f..092d597 100644
--- a/libs/gui/tests/Android.bp
+++ b/libs/gui/tests/Android.bp
@@ -35,7 +35,6 @@
         "libbinder",
         "libcutils",
         "libgui",
-        "libsync",
         "libui",
         "libutils",
     ],

services/sensorservice/SensorDeviceTreble.cpp

diff --git a/services/sensorservice/SensorDeviceTreble.cpp b/services/sensorservice/SensorDeviceTreble.cpp
index 66b0f5a..6f946d0 100644
--- a/services/sensorservice/SensorDeviceTreble.cpp
+++ b/services/sensorservice/SensorDeviceTreble.cpp
@@ -27,7 +27,7 @@
 #include "SensorDevice.h"
 #include "SensorService.h"
 
-#include "convert.h"
+#include <sensors/convert.h>
 
 using android::hardware::sensors::V1_0::ISensors;
 using android::hardware::hidl_vec;