diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-06-13 03:05:42 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-06-13 03:05:42 +0000 |
| commit | 671905ba70579f5ef7b2062e7af1be50aa10f032 (patch) | |
| tree | 913f04a13c21134b33526f2f3ebb2350b9faf73e | |
| parent | 0dc477cdcdb9cdbe94a4f3394d2ef408ccaace1b (diff) | |
| parent | 05c7f27079bd44595cc3efb4b9acb1aa6777716c (diff) | |
| download | wpa_supplicant_8-pie-dr1-release.tar.gz | |
Snap for 4836998 from 05c7f27079bd44595cc3efb4b9acb1aa6777716c to pi-dr1-releaseandroid-9.0.0_r12android-9.0.0_r11pie-dr1-release
Change-Id: I27a1723b6c9ed703c6a3237a65bb0e05343773b1
| -rw-r--r-- | hostapd/Android.mk | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/hostapd/Android.mk b/hostapd/Android.mk index 54d12f6c..c802165a 100644 --- a/hostapd/Android.mk +++ b/hostapd/Android.mk @@ -1072,7 +1072,7 @@ else OBJS_c += src/utils/edit_simple.c endif -ifeq ($(filter gce_x86 gce_x86_64 calypso generic_x86 generic_x86_64 generic generic_arm64, $(TARGET_DEVICE)),) +ifeq ($(filter gce_x86 gce_x86_64 calypso, $(TARGET_DEVICE)),) ifdef CONFIG_CTRL_IFACE_HIDL HOSTAPD_USE_HIDL=y L_CFLAGS += -DCONFIG_CTRL_IFACE_HIDL @@ -1123,6 +1123,30 @@ LOCAL_C_INCLUDES := $(INCLUDES) LOCAL_INIT_RC := hostapd.android.rc include $(BUILD_EXECUTABLE) +######################## +include $(CLEAR_VARS) +LOCAL_MODULE := hostapd_nohidl +LOCAL_MODULE_TAGS := optional +LOCAL_PROPRIETARY_MODULE := true +ifdef CONFIG_DRIVER_CUSTOM +LOCAL_STATIC_LIBRARIES := libCustomWifi +endif +ifneq ($(BOARD_HOSTAPD_PRIVATE_LIB),) +LOCAL_STATIC_LIBRARIES += $(BOARD_HOSTAPD_PRIVATE_LIB) +endif +LOCAL_SHARED_LIBRARIES := libc libcutils liblog libcrypto libssl +ifdef CONFIG_DRIVER_NL80211 +ifneq ($(wildcard external/libnl),) +LOCAL_SHARED_LIBRARIES += libnl +else +LOCAL_STATIC_LIBRARIES += libnl_2 +endif +endif +LOCAL_CFLAGS := $(patsubst -DCONFIG_CTRL_IFACE_HIDL,,$(L_CFLAGS)) +LOCAL_SRC_FILES := $(OBJS) +LOCAL_C_INCLUDES := $(INCLUDES) +include $(BUILD_EXECUTABLE) + ifeq ($(HOSTAPD_USE_HIDL), y) ### Hidl service library ### ######################## |