commit 2c108e8775d1606b369b4bf900e12c9a1c9fb917
author Vijay Venkatraman <vijaykv@google.com> Fri Jan 27 03:14:47 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jan 27 03:14:47 2017 +0000
tree 89ba3b5f6dd82f88c0bbac0b15d0d0c0b1e3bb1f
parent a3083b7af5e3892ee6f1f36218e779e907ee70b1
parent 8a9eb754fcd3b0cddc5841566277283fc210695c

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

Change-Id: I88b2c5889c1ddb35728629615c75bf6e8646420e

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)