LineageOS/android_packages_modules_common
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't explicitly mention SOONG_CONFIG_ variables

Browse Source 
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
This commit is contained in:
Cole Faust
2022-02-28 16:47:36 -08:00
parent 654d81ef49
commit 2f9bf4a102
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/mainline_modules_sdks.py
View File

@@ -134,7 +134,7 @@ class SoongConfigBoilerplateInserter(FileTransformation):
namespace = self.configVar.namespace namespace = self.configVar.namespace
name = self.configVar.name name = self.configVar.name
module_content.append(f"""\ 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, prefer: true,
soong_config_variables: {{ soong_config_variables: {{
{name}: {{ {name}: {{

6
build/mainline_modules_sdks_test_data/art_Android.bp.expected
View File

@@ -18,7 +18,7 @@ package {
art_prebuilt_prebuilt_bootclasspath_fragment { art_prebuilt_prebuilt_bootclasspath_fragment {
name: "art-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, prefer: true,
soong_config_variables: { soong_config_variables: {
source_build: { source_build: {
@@ -63,7 +63,7 @@ art_prebuilt_prebuilt_bootclasspath_fragment {
art_prebuilt_prebuilt_platform_compat_config { art_prebuilt_prebuilt_platform_compat_config {
name: "libcore-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, prefer: true,
soong_config_variables: { soong_config_variables: {
source_build: { source_build: {
@@ -82,7 +82,7 @@ art_prebuilt_prebuilt_platform_compat_config {
art_prebuilt_java_import { art_prebuilt_java_import {
name: "core-oj", 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, prefer: true,
soong_config_variables: { soong_config_variables: {
source_build: { source_build: {

4
build/mainline_modules_sdks_test_data/ipsec_Android.bp.expected
View File

@@ -33,7 +33,7 @@ prebuilt_bootclasspath_fragment {
module_prebuilt_bootclasspath_fragment { module_prebuilt_bootclasspath_fragment {
name: "com.android.ipsec-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, prefer: true,
soong_config_variables: { soong_config_variables: {
module_build_from_source: { module_build_from_source: {
@@ -94,7 +94,7 @@ java_sdk_library_import {
module_java_sdk_library_import { module_java_sdk_library_import {
name: "android.net.ipsec.ike", 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, prefer: true,
soong_config_variables: { soong_config_variables: {
module_build_from_source: { module_build_from_source: {