From 37152ff0680ac99be24d68fe8b9c73b517f77633 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Mon, 27 Jan 2020 19:33:51 -0800 Subject: Stop using LOCAL_COPY_HEADERS All the users of this header are already using it as if LOCAL_EXPORT_C_INCLUDE_DIRS has been set. Bug: 130719878 Test: m libwifi-hal-qcom Test: treehugger Change-Id: I3c335b016208bfa5064f4a02f9f16447c6d29351 --- cld80211-lib/Android.mk | 3 +-- qcwcn/wifi_hal/Android.mk | 4 ---- 2 files changed, 1 insertion(+), 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 \ -- cgit v1.2.3