From 2a3ad4c9eefc9a8d782471262160f0d6ea039abc Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Tue, 27 Sep 2022 18:06:15 +0100 Subject: [PATCH] Use inline soong_config_module_type for Tiramisu Previously, Tiramisu snapshots would use the use_source_config_var property but that does not properly without r.android.com/2234128 so this switches Tiramisu to use inline soong_config_module_type just like is used by S. Bug: 249192297 Test: m nothing BUILD_NUMBER=fixed packages/modules/common/build/mainline_modules_sdk.sh # Run above with and without this change and make sure that it # only changes the for-Tiramisu-build contents and switches to # using inline soong_config_module_type modules to set the prefer # property. Change-Id: I429aeac064c986de654a49258a5f31d7bd9fc3a7 --- build/mainline_modules_sdks.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build/mainline_modules_sdks.py b/build/mainline_modules_sdks.py index aef518f..dd03f46 100755 --- a/build/mainline_modules_sdks.py +++ b/build/mainline_modules_sdks.py @@ -738,8 +738,9 @@ Tiramisu = BuildRelease( name="Tiramisu", # Generate a snapshot for Tiramisu using Soong. creator=create_sdk_snapshots_in_soong, - # This supports the use_source_config_var property. - preferHandling=PreferHandling.USE_SOURCE_CONFIG_VAR_PROPERTY, + # This requires the SoongConfigBoilerplateInserter transformation to be + # applied due to b/249192297. + preferHandling=PreferHandling.SOONG_CONFIG, ) # Insert additional BuildRelease definitions for following releases here,