summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2020-01-28 22:38:43 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2020-01-28 22:38:43 +0000
commitf526767014c7d9db4c79cdf4d64d73a545f43fc1 (patch)
tree6a0f0e1b146a07c5de25c4b5c752b3f2cbab04c1
parente370a751488e6d9075d2bce63e3db579cf5fcfd7 (diff)
parent37152ff0680ac99be24d68fe8b9c73b517f77633 (diff)
downloadwlan-f526767014c7d9db4c79cdf4d64d73a545f43fc1.tar.gz
Merge "Stop using LOCAL_COPY_HEADERS"android-r-preview-1
-rw-r--r--cld80211-lib/Android.mk3
-rw-r--r--qcwcn/wifi_hal/Android.mk4
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 \