commit c312c7fa471ab395c39afbfee1c0e1769a095425
author android-build-team Robot <android-build-team-robot@google.com> Fri Oct 20 08:04:43 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Oct 20 08:04:43 2017 +0000
tree 63d84d5541351a9117db1a041ac9c05537fa88f1
parent 3dfdba7344395d0c22152cce81567efa11abd866
parent 732b7c756f4fe48b82514e1cc786f4a8b4637da4

Snap for 4407698 from 732b7c756f4fe48b82514e1cc786f4a8b4637da4 to pi-release

Change-Id: Iafb09393547ea662e080a62ab6c72a5298122f0f

sl4n/Android.mk

diff --git a/sl4n/Android.mk b/sl4n/Android.mk
index f70aac9..6a3ca26 100644
--- a/sl4n/Android.mk
+++ b/sl4n/Android.mk
@@ -23,6 +23,7 @@
 
 LOCAL_C_INCLUDES += \
   system/bt \
+  system/bt/include \
   $(LOCAL_PATH)/rapidjson/include \
   $(LOCAL_PATH)/facades
 
@@ -38,7 +39,6 @@
   libchrome \
   libcutils \
   libutils \
-  libhardware \
   libwifi-system \
   liblog
 

sl4n/base.h

diff --git a/sl4n/base.h b/sl4n/base.h
index 0947d35..d0ccc8f 100644
--- a/sl4n/base.h
+++ b/sl4n/base.h
@@ -25,7 +25,6 @@
 #include <hardware/bt_gatt.h>
 #include <hardware/bt_pan.h>
 #include <hardware/bt_sock.h>
-#include <hardware/hardware.h>
 #include <base/macros.h>
 
 namespace sl4n {