aboutsummaryrefslogtreecommitdiffstats
path: root/ip
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2017-11-22 00:22:29 +0900
committerLorenzo Colitti <lorenzo@google.com>2017-11-22 00:27:48 +0900
commit4c01d2ecfed64205bb794ffa01d705186f6821ed (patch)
tree4a56d9683737ec68d8f0e5615abfea118eec6426 /ip
parent7f7a7110ec387ccb6f0edbdd6956dee8dc649a87 (diff)
downloadplatform_external_iproute2-4c01d2ecfed64205bb794ffa01d705186f6821ed.tar.gz
platform_external_iproute2-4c01d2ecfed64205bb794ffa01d705186f6821ed.tar.bz2
platform_external_iproute2-4c01d2ecfed64205bb794ffa01d705186f6821ed.zip
Always use the bionic UAPI includes for iproute2.
On some products, the system include patch lists vendor-specific include directories (e.g., hardware/qcom/msm8996) before the bionic include paths. This causes us to pick up versions of critical include files, such as <linux/netlink.h>, which are too old to build iproute2. Fix the iproute2 makefiles to explicitly list the bionic UAPI include directory first. Test: aosp_walleye-eng builds Test: aosp_marlin-eng builds Change-Id: Id0db30f6aed0dd64b6d26a6e88d84798a78c6ab9
Diffstat (limited to 'ip')
-rw-r--r--ip/Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/ip/Android.mk b/ip/Android.mk
index aa1242cf..179611fe 100644
--- a/ip/Android.mk
+++ b/ip/Android.mk
@@ -19,7 +19,7 @@ LOCAL_SHARED_LIBRARIES := libc libm libdl
LOCAL_SHARED_LIBRARIES += libiprouteutil libnetlink
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../include
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/../include $(UAPI_INCLUDES)
LOCAL_CFLAGS := \
-O2 -g \