summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRam Muthiah <rammuthiah@google.com>2023-10-06 13:40:07 -0700
committerRam Muthiah <rammuthiah@google.com>2023-10-06 13:46:45 -0700
commit5e6c1ce750e6ab28b4f34261921d11e4d6f7fdaf (patch)
treefedacf3a1304dc393c56ae00845f4e41cb124fb8
parent1e3f3b4f6582fb997d6f58eb53c316fa7586cc70 (diff)
downloadvirtual-device-android-u-qpr2-beta-3_r0.4.tar.gz
Fixed modules options use to match build.sh patternandroid-u-qpr3-beta-1_r0.7android-u-qpr3-beta-1_r0.5android-u-qpr3-beta-1_r0.4android-u-qpr3-beta-1_r0.3android-u-qpr3-beta-1_r0.2android-u-qpr3-beta-1_r0.1android-u-qpr2-beta-3_r0.7android-u-qpr2-beta-3_r0.6android-u-qpr2-beta-3_r0.5android-u-qpr2-beta-3_r0.4android-u-qpr2-beta-3_r0.3android-u-qpr2-beta-3_r0.2android-u-qpr2-beta-3.1_r0.7android-u-qpr2-beta-3.1_r0.5android-u-qpr2-beta-3.1_r0.4android-u-qpr2-beta-3.1_r0.3android-u-qpr2-beta-3.1_r0.2android-u-qpr2-beta-3.1_r0.1android-u-qpr2-beta-2_r0.7android-u-qpr2-beta-2_r0.5android-u-qpr2-beta-2_r0.4android-u-qpr2-beta-2_r0.3android-u-qpr2-beta-2_r0.2android-u-qpr2-beta-2_r0.1android-u-qpr1-beta-2.2_r0.6android-u-qpr1-beta-2.2_r0.5android-u-qpr1-beta-2.2_r0.4android-u-qpr1-beta-2.2_r0.3android-u-qpr1-beta-2.2_r0.2android-u-qpr1-beta-2.2_r0.1android-15-dp-1_r0.7android-15-dp-1_r0.5android-15-dp-1_r0.4android-15-dp-1_r0.3android-15-dp-1_r0.2android-15-dp-1_r0.1android-14.0.0_r0.56android-14.0.0_r0.55android-14.0.0_r0.54android-14.0.0_r0.53android-14.0.0_r0.52android-14.0.0_r0.51android-14.0.0_r0.44android-14.0.0_r0.43android-14.0.0_r0.42android-14.0.0_r0.41android-14.0.0_r0.40android-14.0.0_r0.39android-14.0.0_r0.37android-14.0.0_r0.36android-14.0.0_r0.35android-14.0.0_r0.34android-14.0.0_r0.33android-14.0.0_r0.31android-14.0.0_r0.25android-14.0.0_r0.23android-14.0.0_r0.22android-14.0.0_r0.21android-14.0.0_r0.19android-gs-tangorpro-5.10-android14-qpr2-betaandroid-gs-tangorpro-5.10-android14-qpr1-betaandroid-gs-tangorpro-5.10-android14-qpr1android-gs-raviole-5.10-android14-qpr2-betaandroid-gs-raviole-5.10-android14-qpr1-betaandroid-gs-raviole-5.10-android14-qpr1android-gs-pantah-5.10-android14-qpr2-betaandroid-gs-pantah-5.10-android14-qpr1-betaandroid-gs-pantah-5.10-android14-qpr1android-gs-lynx-5.10-android14-qpr2-betaandroid-gs-lynx-5.10-android14-qpr1-betaandroid-gs-lynx-5.10-android14-qpr1android-gs-felix-5.10-android14-qpr2-betaandroid-gs-felix-5.10-android14-qpr1-betaandroid-gs-felix-5.10-android14-qpr1android-gs-bluejay-5.10-android14-qpr2-betaandroid-gs-bluejay-5.10-android14-qpr1-betaandroid-gs-bluejay-5.10-android14-qpr1
Per docs, build.sh expects MODULES_OPTIONS to be populated with the raw options and not the file path. Update modules options value in vd config to be correct. Bug: 182417593 Bug: 302421344 Signed-off-by: Ram Muthiah <rammuthiah@google.com> Change-Id: I20c9da6e2efa5dd172ff9ed463193477207b7c30
-rw-r--r--build.config.virtual_device4
-rw-r--r--modules.options2
2 files changed, 3 insertions, 3 deletions
diff --git a/build.config.virtual_device b/build.config.virtual_device
index 322869c..2c7abd4 100644
--- a/build.config.virtual_device
+++ b/build.config.virtual_device
@@ -6,4 +6,6 @@ KERNEL_DIR=common
BUILD_INITRAMFS=1
EXT_MODULES="common-modules/virtual-device"
LZ4_RAMDISK=1
-MODULES_OPTIONS="common-modules/virtual-device/modules.options"
+
+# TODO(b/176860479): Remove once goldfish and cuttlefish share a wifi implementation
+MODULES_OPTIONS="options mac80211_hwsim radios=0"
diff --git a/modules.options b/modules.options
deleted file mode 100644
index ce0df43..0000000
--- a/modules.options
+++ /dev/null
@@ -1,2 +0,0 @@
-# TODO(b/176860479): Remove once goldfish and cuttlefish share a wifi implementation
-options mac80211_hwsim radios=0