summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2017-04-04 21:40:29 -0700
committerDan Willemsen <dwillemsen@google.com>2017-04-04 21:45:06 -0700
commitc1c1759c49502d02b712d0c4ffa4b6cc8393df56 (patch)
treed2e59429cf0b215cb708b0eafc524f2263434104
parent9b5f1c811bbd6bffcf4367948cf87ecc9faac3bd (diff)
Use libhardware_legacy_headers
Instead of the pathmap or using the global include path (which isn't available when building against the NDK or VNDK). Bug: None Test: mmma -j frameworks/opt/net/wifi/libwifi_hal Change-Id: I8280c9219991c083ca07e7ff7227fd69fe62c2d5
-rw-r--r--libwifi_hal/Android.mk7
1 files changed, 4 insertions, 3 deletions
diff --git a/libwifi_hal/Android.mk b/libwifi_hal/Android.mk
index 492091ac7..a34075d6f 100644
--- a/libwifi_hal/Android.mk
+++ b/libwifi_hal/Android.mk
@@ -77,7 +77,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := libwifi-hal-fallback
LOCAL_CFLAGS := $(wifi_hal_cflags)
LOCAL_SRC_FILES := wifi_hal_fallback.cpp
-LOCAL_C_INCLUDES := $(call include-path-for, libhardware_legacy)
+LOCAL_HEADER_LIBRARIES := libhardware_legacy_headers
include $(BUILD_STATIC_LIBRARY)
# Pick a vendor provided HAL implementation library.
@@ -104,8 +104,9 @@ LOCAL_PROPRIETARY_MODULE := true
LOCAL_CFLAGS := $(wifi_hal_cflags)
LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
LOCAL_EXPORT_C_INCLUDE_DIRS := \
- $(LOCAL_PATH)/include \
- $(call include-path-for, libhardware_legacy)
+ $(LOCAL_PATH)/include
+LOCAL_EXPORT_HEADER_LIBRARY_HEADERS := libhardware_legacy_headers
+LOCAL_HEADER_LIBRARIES := libhardware_legacy_headers
LOCAL_SHARED_LIBRARIES := \
libbase \
libcutils \