wifi: Name the service as legacy

Change-Id: I4d3389911d9e6ddf47e8ec24dd2f9e5f9ecdf040

37 files changed, 5 insertions, 5 deletions

diff --git a/wifi/1.0/Android.mk b/wifi/1.0-legacy/Android.mk
index ae084e2..d1cfecc 100644
--- a/wifi/1.0/Android.mk
+++ b/wifi/1.0-legacy/Android.mk
@@ -17,7 +17,7 @@ LOCAL_PATH := $(call my-dir)
 ### android.hardware.wifi static library
 ###
 include $(CLEAR_VARS)
-LOCAL_MODULE := android.hardware.wifi@1.0-service-lib
+LOCAL_MODULE := android.hardware.wifi@1.0-legacy_service-lib
 LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_PROPRIETARY_MODULE := true
 LOCAL_CPPFLAGS := -Wall -Werror -Wextra
@@ -76,7 +76,7 @@ include $(BUILD_STATIC_LIBRARY)
 ### android.hardware.wifi daemon
 ###
 include $(CLEAR_VARS)
-LOCAL_MODULE := android.hardware.wifi@1.0-service
+LOCAL_MODULE := android.hardware.wifi@1.0-service.legacy
 LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_PROPRIETARY_MODULE := true
 LOCAL_CPPFLAGS := -Wall -Werror -Wextra
@@ -97,6 +97,6 @@ LOCAL_SHARED_LIBRARIES := \
     android.hardware.wifi@1.2 \
     android.hardware.wifi@1.3
 LOCAL_STATIC_LIBRARIES := \
-    android.hardware.wifi@1.0-service-lib
-LOCAL_INIT_RC := android.hardware.wifi@1.0-service.rc
+    android.hardware.wifi@1.0-legacy_service-lib
+LOCAL_INIT_RC := android.hardware.wifi@1.0-service.legacy.rc
 include $(BUILD_EXECUTABLE)
diff --git a/wifi/1.0/android.hardware.wifi@1.0-service.rc b/wifi/1.0-legacy/android.hardware.wifi@1.0-service.legacy.rc
index cf849d0..87251e1 100644
--- a/wifi/1.0/android.hardware.wifi@1.0-service.rc
+++ b/wifi/1.0-legacy/android.hardware.wifi@1.0-service.legacy.rc
@@ -1,4 +1,4 @@
-service vendor.wifi_hal_legacy /vendor/bin/hw/android.hardware.wifi@1.0-service
+service vendor.wifi_hal_legacy /vendor/bin/hw/android.hardware.wifi@1.0-service.legacy
     class hal
     capabilities NET_ADMIN NET_RAW SYS_MODULE
     user wifi
diff --git a/wifi/1.0/hidl_callback_util.h b/wifi/1.0-legacy/hidl_callback_util.h
index a44af79..a44af79 100644
--- a/wifi/1.0/hidl_callback_util.h
+++ b/wifi/1.0-legacy/hidl_callback_util.h
diff --git a/wifi/1.0/hidl_return_util.h b/wifi/1.0-legacy/hidl_return_util.h
index 9707444..9707444 100644
--- a/wifi/1.0/hidl_return_util.h
+++ b/wifi/1.0-legacy/hidl_return_util.h
diff --git a/wifi/1.0/hidl_struct_util.cpp b/wifi/1.0-legacy/hidl_struct_util.cpp
index 2e4db70..2e4db70 100644
--- a/wifi/1.0/hidl_struct_util.cpp
+++ b/wifi/1.0-legacy/hidl_struct_util.cpp
diff --git a/wifi/1.0/hidl_struct_util.h b/wifi/1.0-legacy/hidl_struct_util.h
index 3eefd95..3eefd95 100644
--- a/wifi/1.0/hidl_struct_util.h
+++ b/wifi/1.0-legacy/hidl_struct_util.h
diff --git a/wifi/1.0/hidl_sync_util.cpp b/wifi/1.0-legacy/hidl_sync_util.cpp
index 160727f..160727f 100644
--- a/wifi/1.0/hidl_sync_util.cpp
+++ b/wifi/1.0-legacy/hidl_sync_util.cpp
diff --git a/wifi/1.0/hidl_sync_util.h b/wifi/1.0-legacy/hidl_sync_util.h
index ebfb051..ebfb051 100644
--- a/wifi/1.0/hidl_sync_util.h
+++ b/wifi/1.0-legacy/hidl_sync_util.h
diff --git a/wifi/1.0/ringbuffer.cpp b/wifi/1.0-legacy/ringbuffer.cpp
index 1294c52..1294c52 100644
--- a/wifi/1.0/ringbuffer.cpp
+++ b/wifi/1.0-legacy/ringbuffer.cpp
diff --git a/wifi/1.0/ringbuffer.h b/wifi/1.0-legacy/ringbuffer.h
index d9f8df6..d9f8df6 100644
--- a/wifi/1.0/ringbuffer.h
+++ b/wifi/1.0-legacy/ringbuffer.h
diff --git a/wifi/1.0/service.cpp b/wifi/1.0-legacy/service.cpp
index fcbc37c..fcbc37c 100644
--- a/wifi/1.0/service.cpp
+++ b/wifi/1.0-legacy/service.cpp
diff --git a/wifi/1.0/wifi.cpp b/wifi/1.0-legacy/wifi.cpp
index 2f21819..2f21819 100644
--- a/wifi/1.0/wifi.cpp
+++ b/wifi/1.0-legacy/wifi.cpp
diff --git a/wifi/1.0/wifi.h b/wifi/1.0-legacy/wifi.h
index 1c2a154..1c2a154 100644
--- a/wifi/1.0/wifi.h
+++ b/wifi/1.0-legacy/wifi.h
diff --git a/wifi/1.0/wifi_ap_iface.cpp b/wifi/1.0-legacy/wifi_ap_iface.cpp
index 9a8681a..9a8681a 100644
--- a/wifi/1.0/wifi_ap_iface.cpp
+++ b/wifi/1.0-legacy/wifi_ap_iface.cpp
diff --git a/wifi/1.0/wifi_ap_iface.h b/wifi/1.0-legacy/wifi_ap_iface.h
index 98c5c9c..98c5c9c 100644
--- a/wifi/1.0/wifi_ap_iface.h
+++ b/wifi/1.0-legacy/wifi_ap_iface.h
diff --git a/wifi/1.0/wifi_chip.cpp b/wifi/1.0-legacy/wifi_chip.cpp
index e9991dc..e9991dc 100644
--- a/wifi/1.0/wifi_chip.cpp
+++ b/wifi/1.0-legacy/wifi_chip.cpp
diff --git a/wifi/1.0/wifi_chip.h b/wifi/1.0-legacy/wifi_chip.h
index 153ca6a..153ca6a 100644
--- a/wifi/1.0/wifi_chip.h
+++ b/wifi/1.0-legacy/wifi_chip.h
diff --git a/wifi/1.0/wifi_feature_flags.cpp b/wifi/1.0-legacy/wifi_feature_flags.cpp
index 7212cfa..7212cfa 100644
--- a/wifi/1.0/wifi_feature_flags.cpp
+++ b/wifi/1.0-legacy/wifi_feature_flags.cpp
diff --git a/wifi/1.0/wifi_feature_flags.h b/wifi/1.0-legacy/wifi_feature_flags.h
index 3ae6920..3ae6920 100644
--- a/wifi/1.0/wifi_feature_flags.h
+++ b/wifi/1.0-legacy/wifi_feature_flags.h
diff --git a/wifi/1.0/wifi_iface_util.cpp b/wifi/1.0-legacy/wifi_iface_util.cpp
index 34bc02d..34bc02d 100644
--- a/wifi/1.0/wifi_iface_util.cpp
+++ b/wifi/1.0-legacy/wifi_iface_util.cpp
diff --git a/wifi/1.0/wifi_iface_util.h b/wifi/1.0-legacy/wifi_iface_util.h
index 98073e0..98073e0 100644
--- a/wifi/1.0/wifi_iface_util.h
+++ b/wifi/1.0-legacy/wifi_iface_util.h
diff --git a/wifi/1.0/wifi_legacy_hal.cpp b/wifi/1.0-legacy/wifi_legacy_hal.cpp
index 485bd16..485bd16 100644
--- a/wifi/1.0/wifi_legacy_hal.cpp
+++ b/wifi/1.0-legacy/wifi_legacy_hal.cpp
diff --git a/wifi/1.0/wifi_legacy_hal.h b/wifi/1.0-legacy/wifi_legacy_hal.h
index 9cfa172..9cfa172 100644
--- a/wifi/1.0/wifi_legacy_hal.h
+++ b/wifi/1.0-legacy/wifi_legacy_hal.h
diff --git a/wifi/1.0/wifi_legacy_hal_stubs.cpp b/wifi/1.0-legacy/wifi_legacy_hal_stubs.cpp
index dedd2d4..dedd2d4 100644
--- a/wifi/1.0/wifi_legacy_hal_stubs.cpp
+++ b/wifi/1.0-legacy/wifi_legacy_hal_stubs.cpp
diff --git a/wifi/1.0/wifi_legacy_hal_stubs.h b/wifi/1.0-legacy/wifi_legacy_hal_stubs.h
index 64854e0..64854e0 100644
--- a/wifi/1.0/wifi_legacy_hal_stubs.h
+++ b/wifi/1.0-legacy/wifi_legacy_hal_stubs.h
diff --git a/wifi/1.0/wifi_mode_controller.cpp b/wifi/1.0-legacy/wifi_mode_controller.cpp
index c392486..c392486 100644
--- a/wifi/1.0/wifi_mode_controller.cpp
+++ b/wifi/1.0-legacy/wifi_mode_controller.cpp
diff --git a/wifi/1.0/wifi_mode_controller.h b/wifi/1.0-legacy/wifi_mode_controller.h
index ace5a52..ace5a52 100644
--- a/wifi/1.0/wifi_mode_controller.h
+++ b/wifi/1.0-legacy/wifi_mode_controller.h
diff --git a/wifi/1.0/wifi_nan_iface.cpp b/wifi/1.0-legacy/wifi_nan_iface.cpp
index ff9f422..ff9f422 100644
--- a/wifi/1.0/wifi_nan_iface.cpp
+++ b/wifi/1.0-legacy/wifi_nan_iface.cpp
diff --git a/wifi/1.0/wifi_nan_iface.h b/wifi/1.0-legacy/wifi_nan_iface.h
index 737be93..737be93 100644
--- a/wifi/1.0/wifi_nan_iface.h
+++ b/wifi/1.0-legacy/wifi_nan_iface.h
diff --git a/wifi/1.0/wifi_p2p_iface.cpp b/wifi/1.0-legacy/wifi_p2p_iface.cpp
index b5d5886..b5d5886 100644
--- a/wifi/1.0/wifi_p2p_iface.cpp
+++ b/wifi/1.0-legacy/wifi_p2p_iface.cpp
diff --git a/wifi/1.0/wifi_p2p_iface.h b/wifi/1.0-legacy/wifi_p2p_iface.h
index 8a7207a..8a7207a 100644
--- a/wifi/1.0/wifi_p2p_iface.h
+++ b/wifi/1.0-legacy/wifi_p2p_iface.h
diff --git a/wifi/1.0/wifi_rtt_controller.cpp b/wifi/1.0-legacy/wifi_rtt_controller.cpp
index 3dcbee6..3dcbee6 100644
--- a/wifi/1.0/wifi_rtt_controller.cpp
+++ b/wifi/1.0-legacy/wifi_rtt_controller.cpp
diff --git a/wifi/1.0/wifi_rtt_controller.h b/wifi/1.0-legacy/wifi_rtt_controller.h
index eedd22a..eedd22a 100644
--- a/wifi/1.0/wifi_rtt_controller.h
+++ b/wifi/1.0-legacy/wifi_rtt_controller.h
diff --git a/wifi/1.0/wifi_sta_iface.cpp b/wifi/1.0-legacy/wifi_sta_iface.cpp
index a6539e5..a6539e5 100644
--- a/wifi/1.0/wifi_sta_iface.cpp
+++ b/wifi/1.0-legacy/wifi_sta_iface.cpp
diff --git a/wifi/1.0/wifi_sta_iface.h b/wifi/1.0-legacy/wifi_sta_iface.h
index 9224939..9224939 100644
--- a/wifi/1.0/wifi_sta_iface.h
+++ b/wifi/1.0-legacy/wifi_sta_iface.h
diff --git a/wifi/1.0/wifi_status_util.cpp b/wifi/1.0-legacy/wifi_status_util.cpp
index 0a5bb13..0a5bb13 100644
--- a/wifi/1.0/wifi_status_util.cpp
+++ b/wifi/1.0-legacy/wifi_status_util.cpp
diff --git a/wifi/1.0/wifi_status_util.h b/wifi/1.0-legacy/wifi_status_util.h
index bc8baa9..bc8baa9 100644
--- a/wifi/1.0/wifi_status_util.h
+++ b/wifi/1.0-legacy/wifi_status_util.h