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

Merge "Don't explicitly mention SOONG_CONFIG_ variables"

Browse Source
This commit is contained in:
Cole Faust
2022-03-02 18:50:48 +00:00
committed by Gerrit Code Review
parent ad786e72e5 2f9bf4a102
commit 9f8ee5f71f
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
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}: {{

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

@@ -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: {

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

@@ -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: {