Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ab2fac7 authored by Jim Tang's avatar Jim Tang
Browse files

Revert "Wifi: Move LOCAL_VINTF_FRAGMENTS to executables" 

This reverts commit 0d653ad8.

Reason for revert: cannot be added: HAL "android.hardware.wifi" has a conflict.

Change-Id: I33780dcca99015cb97b4f2240d1dfc6c3ebf9638
parent 0d653ad8

wifi/1.4/default/Android.mk

+1 −2
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ LOCAL_PATH := $(call my-dir) 
###

include $(CLEAR_VARS)

LOCAL_MODULE := android.hardware.wifi@1.0-service-lib

LOCAL_VINTF_FRAGMENTS := android.hardware.wifi@1.0-service.xml

LOCAL_MODULE_RELATIVE_PATH := hw

LOCAL_PROPRIETARY_MODULE := true

LOCAL_CPPFLAGS := -Wall -Werror -Wextra
@@ -77,7 +78,6 @@ include $(BUILD_STATIC_LIBRARY) 
###

include $(CLEAR_VARS)

LOCAL_MODULE := android.hardware.wifi@1.0-service

LOCAL_VINTF_FRAGMENTS := android.hardware.wifi@1.0-service.xml

LOCAL_MODULE_RELATIVE_PATH := hw

LOCAL_PROPRIETARY_MODULE := true

LOCAL_CPPFLAGS := -Wall -Werror -Wextra
@@ -107,7 +107,6 @@ include $(BUILD_EXECUTABLE) 
###

include $(CLEAR_VARS)

LOCAL_MODULE := android.hardware.wifi@1.0-service-lazy

LOCAL_VINTF_FRAGMENTS := android.hardware.wifi@1.0-service.xml

LOCAL_OVERRIDES_MODULES := android.hardware.wifi@1.0-service

LOCAL_CFLAGS := -DLAZY_SERVICE

LOCAL_MODULE_RELATIVE_PATH := hw