From 2e9dd0fae5e1e63b7d12eb77acd6b7ca3a47da4a Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Wed, 28 Sep 2022 17:51:30 +0000 Subject: [PATCH] Revert "Use inline soong_config_module_type for Tiramisu" This reverts commit 2a3ad4c9eefc9a8d782471262160f0d6ea039abc. Reason for revert: Not going for this after all DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/tests/hub?filter=highFailureRate&tab=clusterView&clusterId=5071029569483450748 Bug: 249572758 Change-Id: Id8e87d05afe4297e0c5735c67c15935a6a34d9ca --- build/mainline_modules_sdks.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/build/mainline_modules_sdks.py b/build/mainline_modules_sdks.py index dd03f46..aef518f 100755 --- a/build/mainline_modules_sdks.py +++ b/build/mainline_modules_sdks.py @@ -738,9 +738,8 @@ Tiramisu = BuildRelease( name="Tiramisu", # Generate a snapshot for Tiramisu using Soong. creator=create_sdk_snapshots_in_soong, - # This requires the SoongConfigBoilerplateInserter transformation to be - # applied due to b/249192297. - preferHandling=PreferHandling.SOONG_CONFIG, + # This supports the use_source_config_var property. + preferHandling=PreferHandling.USE_SOURCE_CONFIG_VAR_PROPERTY, ) # Insert additional BuildRelease definitions for following releases here,