summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2017-04-05 22:42:16 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-04-05 22:42:18 +0000
commit5ed0a08cce018a10dce2b84f7d818e0f12c09f15 (patch)
tree520fba6905669717bba6869be4f5071c8b83103a
parenta805f151c790272d2c016cf59b89b052981bb7ae (diff)
parent398adb642dd965c1f99e5db9fd1743fdea275bb0 (diff)
Merge "Use libhardware_legacy_headers" into oc-dev
-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 \