aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2017-05-26 23:06:28 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-05-26 23:06:28 +0000
commita8ffd6edfd1c3d369339f1e1311fd44104130422 (patch)
tree6a56a03f7b4b6f8057f3e4019e39ca7ca0f7febc
parentcd2d176bd95bb64304369189f173c04fd5919a66 (diff)
parente244b9f12738a6c03ba06946ae9d9ef77983b374 (diff)
downloadstrace-a8ffd6edfd1c3d369339f1e1311fd44104130422.tar.gz
Merge "Remove the workaround now the scsi headers work in the platform." am: 5d53e81b8f am: f36002c6fd am: 2e1c9d5c4a
am: e244b9f127 Change-Id: I658b8c7549bac07162d19e6c2c7c0c75410510e2
-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