diff options
| author | Paul Stewart <pstew@google.com> | 2015-09-28 17:33:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-09-28 17:33:44 +0000 |
| commit | 014a6e44c6c43fe9a382373908e8d6ff9efbf97c (patch) | |
| tree | b26294131b404414e1ee6c5f3da8165e055224ad | |
| parent | 4e31efe579cb3f7b5bda96fe9ee432349e2369e3 (diff) | |
| parent | dcc28b76fe54fd0401c49887f98c7b85d3de27fb (diff) | |
| download | qcom-014a6e44c6c43fe9a382373908e8d6ff9efbf97c.tar.gz | |
Merge "Make WiFi driver module definition conditional" into mnc-brillo-dev
| -rw-r--r-- | peripheral/wifi/wcn3620/Android.mk | 6 | ||||
| -rw-r--r-- | peripheral/wifi/wcn3620/peripheral.mk | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/peripheral/wifi/wcn3620/Android.mk b/peripheral/wifi/wcn3620/Android.mk index fd86093..cc9fe4a 100644 --- a/peripheral/wifi/wcn3620/Android.mk +++ b/peripheral/wifi/wcn3620/Android.mk @@ -12,6 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +ifeq ($(WIFI_DRIVER_HAL_PERIPHERAL),wcn3620) + LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) @@ -21,8 +23,10 @@ LOCAL_C_INCLUDES += device/generic/brillo/wifi_driver_hal/include LOCAL_SHARED_LIBRARIES := libcutils LOCAL_CPPFLAGS += -DLOG_TAG=\"hal_qcwcn\" LOCAL_SRC_FILES := wifi_driver_hal_qcwcn.cpp -LOCAL_MODULE := wifi_driver.$(soc_name) +LOCAL_MODULE := $(WIFI_DRIVER_HAL_MODULE) LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_MODULE_TAGS := optional include $(BUILD_SHARED_LIBRARY) + +endif diff --git a/peripheral/wifi/wcn3620/peripheral.mk b/peripheral/wifi/wcn3620/peripheral.mk index cf37e4d..fd148af 100644 --- a/peripheral/wifi/wcn3620/peripheral.mk +++ b/peripheral/wifi/wcn3620/peripheral.mk @@ -36,5 +36,6 @@ PRIMA_COPY_FILES += \ PRODUCT_COPY_FILES += $(PRIMA_COPY_FILES) WIFI_DRIVER_HAL_MODULE := wifi_driver.$(soc_name) +WIFI_DRIVER_HAL_PERIPHERAL := wcn3620 BOARD_SEPOLICY_DIRS += $(WLAN_BSP_SRC)/sepolicy |