Merge changes I90566684,I93018920 into tm-qpr-dev
* changes:
Allow targets deriving from CF to turn off rename_eth0
Allow targets deriving from CF choosing the interface to setup wifi on.
diff --git a/guest/commands/setup_wifi/setup_wifi.rc b/guest/commands/setup_wifi/setup_wifi.rc
index a2f1eb5..993e957 100644
--- a/guest/commands/setup_wifi/setup_wifi.rc
+++ b/guest/commands/setup_wifi/setup_wifi.rc
@@ -1,2 +1,2 @@
-service setup_wifi /vendor/bin/setup_wifi
+service setup_wifi /vendor/bin/setup_wifi --interface=${ro.vendor.virtwifi.port}
oneshot
diff --git a/shared/config/init.vendor.rc b/shared/config/init.vendor.rc
index cb702a0..83a52c4 100644
--- a/shared/config/init.vendor.rc
+++ b/shared/config/init.vendor.rc
@@ -55,7 +55,7 @@
# set RLIMIT_MEMLOCK to 64MB
setrlimit 8 67108864 67108864
-on post-fs-data
+on post-fs-data && property:ro.vendor.disable_rename_eth0=
# works around framework netiface enumeration issue
# TODO(b/202731768): Add this `start rename_eth0` command to the init.rc for rename_netiface
start rename_eth0
diff --git a/shared/device.mk b/shared/device.mk
index ebd5216..3213aeb 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -772,6 +772,12 @@
PRODUCT_COPY_FILES += \
device/google/cuttlefish/shared/config/wpa_supplicant.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/wpa_supplicant.rc
+# VirtWifi interface configuration
+ifeq ($(DEVICE_VIRTWIFI_PORT),)
+ DEVICE_VIRTWIFI_PORT := eth2
+endif
+PRODUCT_VENDOR_PROPERTIES += ro.vendor.virtwifi.port=${DEVICE_VIRTWIFI_PORT}
+
# WLAN driver configuration files
ifndef LOCAL_WPA_SUPPLICANT_OVERLAY
LOCAL_WPA_SUPPLICANT_OVERLAY := $(LOCAL_PATH)/config/wpa_supplicant_overlay.conf
