aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2017-05-26 22:53:34 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-05-26 22:53:34 +0000
commit2e1c9d5c4a2b510f5ced3f4936ef2bbca8011f79 (patch)
tree6a56a03f7b4b6f8057f3e4019e39ca7ca0f7febc
parent5829b8e9c9087206e12fe1423f35cef3d0baa208 (diff)
parentf36002c6fd07e8ca15d41b11746becb169314fb9 (diff)
downloadstrace-2e1c9d5c4a2b510f5ced3f4936ef2bbca8011f79.tar.gz
Merge "Remove the workaround now the scsi headers work in the platform." am: 5d53e81b8f
am: f36002c6fd Change-Id: I28a81576d129380e04bbf3718adbcf54c8431f72
-rw-r--r--Android.mk3
1 files changed, 0 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk
index 1ea676f8..d9a74f39 100644
--- a/Android.mk
+++ b/Android.mk
@@ -348,9 +348,6 @@ LOCAL_C_INCLUDES_mips64 := $(LOCAL_PATH)/linux/mips $(LOCAL_PATH)/linux
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