commit d0b70efd15aa33a1c9c57eaeaa9ed04b4aebc140
author Vijay Venkatraman <vijaykv@google.com> Fri Jan 27 03:21:48 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jan 27 03:21:48 2017 +0000
tree 89ba3b5f6dd82f88c0bbac0b15d0d0c0b1e3bb1f
parent 6335afc57e1dc776354b38fa1f220eb3e5f756da
parent 5f841f335272a87325319311fa3b1169f4550fe1

Merge "Removing LOCAL_COPY_HEADERS so LOCAL_EXPORT_C_INCLUDE_DIRS is used, as per VNDK" am: 7ed6a1b958 am: 8a9eb754fc am: 2c108e8775
am: 5f841f3352

Change-Id: Ib0e2ca5c3165367a5f41e87b7d47b719848c9801

wpa_supplicant/Android.mk

diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index afbe336..71e08e7 100644
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -1656,10 +1656,7 @@
 LOCAL_SRC_FILES = src/common/wpa_ctrl.c src/utils/os_$(CONFIG_OS).c
 LOCAL_C_INCLUDES = $(INCLUDES)
 LOCAL_SHARED_LIBRARIES := libcutils liblog
-LOCAL_COPY_HEADERS_TO := libwpa_client
-LOCAL_COPY_HEADERS := src/common/wpa_ctrl.h
-LOCAL_COPY_HEADERS += src/common/qca-vendor.h
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/wpa_client_include
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/wpa_client_include $(LOCAL_PATH)/wpa_client_include/libwpa_client
 include $(BUILD_SHARED_LIBRARY)
 
 ifeq ($(WPA_SUPPLICANT_USE_HIDL), y)