diff options
| author | Pierre Couillaud <pierre@broadcom.com> | 2018-02-16 19:37:28 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-02-16 19:37:28 +0000 |
| commit | 02a935fe5f17e583d63436ac91eca71e533632da (patch) | |
| tree | c2f3898b7dc1719d377f3d6495d7516fc5dd92cf | |
| parent | 0b376c4ca726129274b10c58d035d4db328ec342 (diff) | |
| parent | 8be125de8b93449cd7747ee0770f814f196c000b (diff) | |
| download | android_hardware_broadcom_wlan-02a935fe5f17e583d63436ac91eca71e533632da.tar.gz android_hardware_broadcom_wlan-02a935fe5f17e583d63436ac91eca71e533632da.tar.bz2 android_hardware_broadcom_wlan-02a935fe5f17e583d63436ac91eca71e533632da.zip | |
Merge "wlan:bcmdhd: fixup build errors when building the library under vndk." am: 06485a95d7
am: 8be125de8b
Change-Id: Ia6e3e4ab0f74e1fba37c58cafda7739b6370efaa
| -rw-r--r-- | bcmdhd/wifi_hal/Android.mk | 2 | ||||
| -rw-r--r-- | bcmdhd/wifi_hal/common.h | 2 | ||||
| -rw-r--r-- | bcmdhd/wifi_hal/gscan.cpp | 2 | ||||
| -rw-r--r-- | bcmdhd/wifi_hal/link_layer_stats.cpp | 2 | ||||
| -rw-r--r-- | bcmdhd/wifi_hal/rtt.cpp | 2 | ||||
| -rw-r--r-- | bcmdhd/wifi_hal/wifi_hal.cpp | 2 | ||||
| -rw-r--r-- | bcmdhd/wpa_supplicant_8_lib/Android.mk | 1 |
7 files changed, 8 insertions, 5 deletions
diff --git a/bcmdhd/wifi_hal/Android.mk b/bcmdhd/wifi_hal/Android.mk index 48a7b12..b4fe46e 100644 --- a/bcmdhd/wifi_hal/Android.mk +++ b/bcmdhd/wifi_hal/Android.mk @@ -33,6 +33,8 @@ LOCAL_C_INCLUDES += \ $(call include-path-for, libhardware_legacy)/hardware_legacy \ external/wpa_supplicant_8/src/drivers +LOCAL_HEADER_LIBRARIES := libutils_headers liblog_headers + LOCAL_SRC_FILES := \ wifi_hal.cpp \ rtt.cpp \ diff --git a/bcmdhd/wifi_hal/common.h b/bcmdhd/wifi_hal/common.h index e941f0c..28e2156 100644 --- a/bcmdhd/wifi_hal/common.h +++ b/bcmdhd/wifi_hal/common.h @@ -23,7 +23,7 @@ #define LOG_TAG "WifiHAL" -#include <utils/Log.h> +#include <log/log.h> #include "nl80211_copy.h" #include "sync.h" diff --git a/bcmdhd/wifi_hal/gscan.cpp b/bcmdhd/wifi_hal/gscan.cpp index d50e98f..1ccaf30 100644 --- a/bcmdhd/wifi_hal/gscan.cpp +++ b/bcmdhd/wifi_hal/gscan.cpp @@ -38,7 +38,7 @@ #define LOG_TAG "WifiHAL" //#define LOG_NDEBUG 0 //uncomment to enable verbose logging -#include <utils/Log.h> +#include <log/log.h> #include "wifi_hal.h" #include "common.h" diff --git a/bcmdhd/wifi_hal/link_layer_stats.cpp b/bcmdhd/wifi_hal/link_layer_stats.cpp index e80a050..42e3f2f 100644 --- a/bcmdhd/wifi_hal/link_layer_stats.cpp +++ b/bcmdhd/wifi_hal/link_layer_stats.cpp @@ -37,7 +37,7 @@ #define LOG_TAG "WifiHAL" -#include <utils/Log.h> +#include <log/log.h> #include "wifi_hal.h" #include "common.h" diff --git a/bcmdhd/wifi_hal/rtt.cpp b/bcmdhd/wifi_hal/rtt.cpp index 9bb1ed7..81eb17f 100644 --- a/bcmdhd/wifi_hal/rtt.cpp +++ b/bcmdhd/wifi_hal/rtt.cpp @@ -40,7 +40,7 @@ #define LOG_TAG "WifiHAL" -#include <utils/Log.h> +#include <log/log.h> #include <utils/String8.h> #include "wifi_hal.h" diff --git a/bcmdhd/wifi_hal/wifi_hal.cpp b/bcmdhd/wifi_hal/wifi_hal.cpp index fe0ecca..511ff3f 100644 --- a/bcmdhd/wifi_hal/wifi_hal.cpp +++ b/bcmdhd/wifi_hal/wifi_hal.cpp @@ -43,7 +43,7 @@ #define LOG_TAG "WifiHAL" -#include <utils/Log.h> +#include <log/log.h> #include "wifi_hal.h" #include "common.h" diff --git a/bcmdhd/wpa_supplicant_8_lib/Android.mk b/bcmdhd/wpa_supplicant_8_lib/Android.mk index db350cf..518f0ca 100644 --- a/bcmdhd/wpa_supplicant_8_lib/Android.mk +++ b/bcmdhd/wpa_supplicant_8_lib/Android.mk @@ -70,6 +70,7 @@ LOCAL_SHARED_LIBRARIES := libc libcutils LOCAL_CFLAGS := $(L_CFLAGS) LOCAL_SRC_FILES := $(WPA_SRC_FILE) LOCAL_C_INCLUDES := $(WPA_SUPPL_DIR_INCLUDE) +LOCAL_VENDOR_MODULE := true include $(BUILD_STATIC_LIBRARY) ######################## |