From 2f9bf4a102d093e03c10804a9e1834cba71acff8 Mon Sep 17 00:00:00 2001
From: Cole Faust <colefaust@google.com>
Date: Mon, 28 Feb 2022 16:47:36 -0800
Subject: [PATCH] Don't explicitly mention SOONG_CONFIG_ variables

The soong config variables should be controlled via
$(call soong_config_set/get) instead of using the
underlaying variable. Update the comments in the
auto generated makefiles to reflect that.

Bug: 220940864
Test: m mainline_modules_sdks_test && /ssd/aosp-master/out/host/linux-x86/nativetest64/mainline_modules_sdks_test/mainline_modules_sdks_test
Change-Id: I8907d89ceb12e0a1e9ce53220a784e4a69502687
---
 build/mainline_modules_sdks.py                              | 2 +-
 .../mainline_modules_sdks_test_data/art_Android.bp.expected | 6 +++---
 .../ipsec_Android.bp.expected                               | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build/mainline_modules_sdks.py b/build/mainline_modules_sdks.py
index 076a811..b944f2b 100755
--- a/build/mainline_modules_sdks.py
+++ b/build/mainline_modules_sdks.py
@@ -134,7 +134,7 @@ class SoongConfigBoilerplateInserter(FileTransformation):
                 namespace = self.configVar.namespace
                 name = self.configVar.name
                 module_content.append(f"""\
-    // Do not prefer prebuilt if SOONG_CONFIG_{namespace}_{name} is true.
+    // Do not prefer prebuilt if the Soong config variable "{name}" in namespace "{namespace}" is true.
     prefer: true,
     soong_config_variables: {{
         {name}: {{
diff --git a/build/mainline_modules_sdks_test_data/art_Android.bp.expected b/build/mainline_modules_sdks_test_data/art_Android.bp.expected
index 1d6f558..135e4e6 100644
--- a/build/mainline_modules_sdks_test_data/art_Android.bp.expected
+++ b/build/mainline_modules_sdks_test_data/art_Android.bp.expected
@@ -18,7 +18,7 @@ package {
 
 art_prebuilt_prebuilt_bootclasspath_fragment {
     name: "art-bootclasspath-fragment",
-    // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+    // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
     prefer: true,
     soong_config_variables: {
         source_build: {
@@ -63,7 +63,7 @@ art_prebuilt_prebuilt_bootclasspath_fragment {
 
 art_prebuilt_prebuilt_platform_compat_config {
     name: "libcore-platform-compat-config",
-    // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+    // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
     prefer: true,
     soong_config_variables: {
         source_build: {
@@ -82,7 +82,7 @@ art_prebuilt_prebuilt_platform_compat_config {
 
 art_prebuilt_java_import {
     name: "core-oj",
-    // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+    // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
     prefer: true,
     soong_config_variables: {
         source_build: {
diff --git a/build/mainline_modules_sdks_test_data/ipsec_Android.bp.expected b/build/mainline_modules_sdks_test_data/ipsec_Android.bp.expected
index 4586eac..99640c0 100644
--- a/build/mainline_modules_sdks_test_data/ipsec_Android.bp.expected
+++ b/build/mainline_modules_sdks_test_data/ipsec_Android.bp.expected
@@ -33,7 +33,7 @@ prebuilt_bootclasspath_fragment {
 
 module_prebuilt_bootclasspath_fragment {
     name: "com.android.ipsec-bootclasspath-fragment",
-    // Do not prefer prebuilt if SOONG_CONFIG_ANDROID_module_build_from_source is true.
+    // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
     prefer: true,
     soong_config_variables: {
         module_build_from_source: {
@@ -94,7 +94,7 @@ java_sdk_library_import {
 
 module_java_sdk_library_import {
     name: "android.net.ipsec.ike",
-    // Do not prefer prebuilt if SOONG_CONFIG_ANDROID_module_build_from_source is true.
+    // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
     prefer: true,
     soong_config_variables: {
         module_build_from_source: {