commit 5d53e81b8f4c7097c27d56f0e24d8e04b0ceafb7
author Treehugger Robot <treehugger-gerrit@google.com> Fri May 26 22:46:21 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 26 22:46:23 2017 +0000
tree 6a56a03f7b4b6f8057f3e4019e39ca7ca0f7febc
parent 5312218a62ac278ccf66eea96e5b554214155218
parent a30be45b34b87c9701eaf793cfdfa1e4f0adccd9

Merge "Remove the workaround now the scsi headers work in the platform."

Android.mk

diff --git a/Android.mk b/Android.mk
index 1ea676f..d9a74f3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -348,9 +348,6 @@
 LOCAL_C_INCLUDES_x86 := $(LOCAL_PATH)/linux/i386 $(LOCAL_PATH)/linux
 LOCAL_C_INCLUDES_x86_64 := $(LOCAL_PATH)/linux/x86_64 $(LOCAL_PATH)/linux
 
-# For <scsi/sg.h>. TODO: export this properly from bionic (without breaking the NDK).
-LOCAL_C_INCLUDES += bionic/libc/kernel/android/
-
 LOCAL_CLANG := true
 
 LOCAL_MODULE := strace