commit 1f61ab5b108b29c916ac5b66dad4da2835df3a0f
author Roshan Pius <rpius@google.com> Thu Nov 17 01:05:10 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Nov 17 01:05:10 2016 +0000
tree ded90fabac7a8151b80d8e89e403845206964422
parent da29240c74580bc7a614f1c02086c4df4bd88d90
parent 23baa7c2a82b6857bb09149dbea2e9fb5f4f14d8

wifi: Remove passthrough mode am: 23f9f30344
am: 23baa7c2a8

Change-Id: Iaf5eff82a47d60888ed9c0b1ea3de785e094ccd5

wifi/1.0/default/Android.mk

diff --git a/wifi/1.0/default/Android.mk b/wifi/1.0/default/Android.mk
index 3d8c689..e84124e 100644
--- a/wifi/1.0/default/Android.mk
+++ b/wifi/1.0/default/Android.mk
@@ -14,10 +14,11 @@
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := android.hardware.wifi@1.0-impl
+LOCAL_MODULE := android.hardware.wifi@1.0-service
 LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_CPPFLAGS := -std=c++11 -Wall -Wno-unused-parameter -Werror -Wextra
 LOCAL_SRC_FILES := \
+    service.cpp \
     wifi.cpp \
     wifi_ap_iface.cpp \
     wifi_chip.cpp \
@@ -38,25 +39,5 @@
     libutils \
     libwifi-system
 LOCAL_WHOLE_STATIC_LIBRARIES := $(LIB_WIFI_HAL)
-include $(BUILD_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := android.hardware.wifi@1.0-service
-LOCAL_MODULE_RELATIVE_PATH := hw
-LOCAL_CPPFLAGS := -std=c++11 -Wall -Wno-unused-parameter -Werror -Wextra
-LOCAL_SRC_FILES := \
-    service.cpp
-LOCAL_SHARED_LIBRARIES := \
-    android.hardware.wifi@1.0 \
-    android.hardware.wifi@1.0-impl \
-    libbase \
-    libcutils \
-    libhidl \
-    libhwbinder \
-    liblog \
-    libnl \
-    libutils \
-    libwifi-system
-LOCAL_WHOLE_STATIC_LIBRARIES := $(LIB_WIFI_HAL)
 LOCAL_INIT_RC := android.hardware.wifi@1.0-service.rc
 include $(BUILD_EXECUTABLE)