diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-28 22:57:41 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-28 22:57:41 +0000 |
| commit | 9ea329ed1255af74f16722074023b04cfb9b938e (patch) | |
| tree | 6a0f0e1b146a07c5de25c4b5c752b3f2cbab04c1 | |
| parent | 10ea32d47069eb026f822e30a9a23be9d0345ca1 (diff) | |
| parent | db4bd178589558fdf63c7ce52b754c7219568d82 (diff) | |
| download | wlan-9ea329ed1255af74f16722074023b04cfb9b938e.tar.gz | |
Merge "Stop using LOCAL_COPY_HEADERS" am: f526767014 am: db4bd17858
Change-Id: I37d36849748a9a3ccbf31fa9d0a81148b40f0ca4
| -rw-r--r-- | cld80211-lib/Android.mk | 3 | ||||
| -rw-r--r-- | qcwcn/wifi_hal/Android.mk | 4 |
2 files changed, 1 insertions, 6 deletions
diff --git a/cld80211-lib/Android.mk b/cld80211-lib/Android.mk index f2b93f7..76d49fb 100644 --- a/cld80211-lib/Android.mk +++ b/cld80211-lib/Android.mk @@ -9,8 +9,7 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH) \ LOCAL_SHARED_LIBRARIES := libcutils libnl liblog LOCAL_SRC_FILES := cld80211_lib.c LOCAL_CFLAGS += -Wall -Werror -Wno-unused-parameter -LOCAL_COPY_HEADERS_TO := cld80211-lib -LOCAL_COPY_HEADERS := cld80211_lib.h +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) LOCAL_VENDOR_MODULE := true include $(BUILD_SHARED_LIBRARY) diff --git a/qcwcn/wifi_hal/Android.mk b/qcwcn/wifi_hal/Android.mk index 0b76f66..3d872bb 100644 --- a/qcwcn/wifi_hal/Android.mk +++ b/qcwcn/wifi_hal/Android.mk @@ -55,9 +55,7 @@ LOCAL_C_INCLUDES += \ external/libnl/include \ $(call include-path-for, libhardware_legacy)/hardware_legacy \ external/wpa_supplicant_8/src/drivers \ - $(TARGET_OUT_HEADERS)/libwpa_client \ $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \ - $(TARGET_OUT_HEADERS)/cld80211-lib LOCAL_SRC_FILES := \ list.cpp \ @@ -121,9 +119,7 @@ LOCAL_C_INCLUDES += \ external/libnl/include \ $(call include-path-for, libhardware_legacy)/hardware_legacy \ external/wpa_supplicant_8/src/drivers \ - $(TARGET_OUT_HEADERS)/libwpa_client \ $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \ - $(TARGET_OUT_HEADERS)/cld80211-lib LOCAL_SRC_FILES := \ list.cpp \ |